uncrustify-trinity: updated based on upstream version 0.78.0

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

5056 files changed, 16334 insertions, 7627 deletions

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/compat b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/compat
deleted file mode 100644
index ec635144..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/003_allow_older_distributions.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/003_allow_older_distributions.diff
deleted file mode 100644
index 8643a7cd..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/003_allow_older_distributions.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: b/CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.2)
-+cmake_minimum_required(VERSION 3.0)
- 
- project(uncrustify-trinity)
- 
-@@ -59,8 +59,12 @@
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
- endif()
- 
--set(CMAKE_CXX_STANDARD 11)
--set(CMAKE_CXX_STANDARD_REQUIRED YES)
-+if( ${CMAKE_VERSION} VERSION_LESS "3.1" )
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-+else()
-+  set(CMAKE_CXX_STANDARD 11)
-+  set(CMAKE_CXX_STANDARD_REQUIRED YES)
-+endif()
- 
- if(ENABLE_SANITIZER)
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O1 -fno-omit-frame-pointer -fsanitize=${ENABLE_SANITIZER}")
-@@ -147,8 +151,13 @@
- else()
-   # Add target to generate version header;
-   # do this every build to ensure git SHA is up to date
-+  if( ${CMAKE_VERSION} VERSION_LESS "3.2" )
-+    set( VERSION_HEADER_BYPRODUCTS "" )
-+  else()
-+    set( VERSION_HEADER_BYPRODUCTS "BYPRODUCTS" "${PROJECT_BINARY_DIR}/uncrustify_version.h" )
-+  endif()
-   add_custom_target(generate_version_header
--    BYPRODUCTS "${PROJECT_BINARY_DIR}/uncrustify_version.h"
-+    ${VERSION_HEADER_BYPRODUCTS}
-     COMMAND
-       ${CMAKE_COMMAND}
-       -D PYTHON_EXECUTABLE:STRING=${PYTHON_EXECUTABLE}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ParseFrame.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ParseFrame.cpp
deleted file mode 100644
index 837871cb..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ParseFrame.cpp
+++ /dev/null
@@ -1,352 +0,0 @@
-/**
- * @file ParseFrame.cpp
- *
- * Container that holds data needed for indenting and brace parsing
- *
- * @author  Daniel Chumak
- * @license GPL v2+
- */
-
-#include "ParseFrame.h"
-
-#include "chunk.h"
-#include "uncrustify.h"
-
-#include <stdexcept>            // to get std::logic_error
-
-
-using std::string;
-using std::to_string;
-using std::invalid_argument;
-
-using ContainerType = paren_stack_entry_t;
-using Container     = std::vector<ContainerType>;
-
-
-//! amount of elements for which memory is going to be pre-initialized
-static constexpr const int CONTAINER_INIT_SIZE = 16;
-
-
-static ContainerType genDummy()
-{
-   ContainerType tmp_dummy{};
-
-   tmp_dummy.indent     = 1;
-   tmp_dummy.indent_tmp = 1;
-   tmp_dummy.indent_tab = 1;
-   tmp_dummy.type       = CT_EOF;
-   tmp_dummy.pc         = Chunk::NullChunkPtr;
-   tmp_dummy.pop_pc     = Chunk::NullChunkPtr;
-
-   return(tmp_dummy);
-}
-
-
-void ParseFrame::clear()
-{
-   last_poped = genDummy();
-
-   pse = Container{};
-   pse.reserve(CONTAINER_INIT_SIZE);
-   pse.push_back(genDummy());
-
-   ref_no       = 0;
-   level        = 0;
-   brace_level  = 0;
-   pp_level     = 0;
-   sparen_count = 0;
-   paren_count  = 0;
-   in_ifdef     = E_Token::CT_NONE;
-   stmt_count   = 0;
-   expr_count   = 0;
-}
-
-
-ParseFrame::ParseFrame()
-{
-   ParseFrame::clear();
-}
-
-
-bool ParseFrame::empty() const
-{
-   // always at least one (dummy) element inside pse guaranteed
-   return(false);
-//   return(pse.empty());
-}
-
-
-ContainerType &ParseFrame::at(size_t idx)
-{
-   return(pse.at(idx));
-}
-
-
-const ContainerType &ParseFrame::at(size_t idx) const
-{
-   return(pse.at(idx));
-}
-
-
-ContainerType &ParseFrame::prev(size_t idx)
-{
-   LOG_FUNC_ENTRY();
-
-   if (idx == 0)
-   {
-      throw invalid_argument(string(__FILE__) + ":" + to_string(__LINE__)
-                             + " idx can't be zero");
-   }
-
-   if (idx >= pse.size())
-   {
-      LOG_FMT(LINDPSE, "%s(%d): idx is %zu, size is %zu\n",
-              __func__, __LINE__, idx, pse.size());
-      throw invalid_argument(string(__FILE__) + ":" + to_string(__LINE__)
-                             + " idx can't be >= size()");
-   }
-   return(*std::prev(std::end(pse), idx + 1));
-}
-
-
-const ContainerType &ParseFrame::prev(size_t idx) const
-{
-   LOG_FUNC_ENTRY();
-
-   if (  idx == 0
-      || idx >= pse.size())
-   {
-      throw invalid_argument(string(__FILE__) + ":" + to_string(__LINE__)
-                             + " idx can't be zero or >= size()");
-   }
-   return(*std::prev(std::end(pse), idx + 1));
-}
-
-
-ContainerType &ParseFrame::top()
-{
-   // always at least one (dummy) element inside pse guaranteed
-//   if (pse.empty())
-//   {
-//      throw logic_error(string(__FILE__) + ":" + to_string(__LINE__)
-//                        + " called top on an empty stack");
-//   }
-   return(*std::prev(std::end(pse)));
-}
-
-
-const ContainerType &ParseFrame::top() const
-{
-   // always at least one (dummy) element inside pse guaranteed
-//   if (pse.empty())
-//   {
-//      throw logic_error(string(__FILE__) + ":" + to_string(__LINE__)
-//                        + " called top on an empty stack");
-//   }
-   return(*std::prev(std::end(pse)));
-}
-
-
-void ParseFrame::push(std::nullptr_t, brace_stage_e stage)
-{
-   static Chunk dummy;
-
-   push(&dummy, __func__, __LINE__, stage);
-   top().pc = Chunk::NullChunkPtr;
-}
-
-
-void ParseFrame::push(Chunk *pc, const char *func, int line, brace_stage_e stage)
-{
-   LOG_FUNC_ENTRY();
-
-   ContainerType new_entry = {};
-
-   new_entry.type      = pc->GetType();
-   new_entry.level     = pc->GetLevel();
-   new_entry.open_line = pc->GetOrigLine();
-   new_entry.open_colu = pc->GetOrigCol();
-   new_entry.pc        = pc;
-
-   new_entry.indent_tab  = top().indent_tab;
-   new_entry.indent_cont = top().indent_cont;
-   new_entry.stage       = stage;
-
-   new_entry.in_preproc = pc->TestFlags(PCF_IN_PREPROC);
-   new_entry.non_vardef = false;
-   new_entry.ip         = top().ip;
-   new_entry.pop_pc     = Chunk::NullChunkPtr;
-
-   pse.push_back(new_entry);
-
-// uncomment the line below to get the address of the pse
-// #define DEBUG_PUSH_POP
-#ifdef DEBUG_PUSH_POP
-   LOG_FMT(LINDPSE, "ParseFrame::push(%s:%d) Add is %4zu: orig line is %4zu, orig col is %4zu, type is %12s, "
-           "brace level is %2zu, level is %2zu, pse_tos: %2zu -> %2zu\n",
-           func, line, (size_t)this, pc->GetOrigLine(), pc->GetOrigCol(),
-           get_token_name(pc->GetType()), pc->GetBraceLevel(), pc->GetLevel(),
-           (pse.size() - 2), (pse.size() - 1));
-#else /* DEBUG_PUSH_POP */
-   LOG_FMT(LINDPSE, "ParseFrame::push(%s:%d): orig line is %4zu, orig col is %4zu, type is %12s, "
-           "brace level is %2zu, level is %2zu, pse_tos: %2zu -> %2zu\n",
-           func, line, pc->GetOrigLine(), pc->GetOrigCol(),
-           get_token_name(pc->GetType()), pc->GetBraceLevel(), pc->GetLevel(),
-           (pse.size() - 2), (pse.size() - 1));
-#endif /* DEBUG_PUSH_POP */
-}
-
-
-void ParseFrame::pop(const char *func, int line, Chunk *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   // always at least one (dummy) element inside pse guaranteed
-//   if (pse.empty())
-//   {
-//      throw logic_error(string(__FILE__) + ":" + to_string(__LINE__)
-//                        + "the stack index is already zero");
-//   }
-
-   if (  pc->GetType() == CT_PAREN_CLOSE
-      || pc->GetType() == CT_BRACE_CLOSE
-      || pc->GetType() == CT_VBRACE_CLOSE
-      || pc->GetType() == CT_FPAREN_CLOSE
-      || pc->GetType() == CT_LPAREN_CLOSE
-      || pc->GetType() == CT_SPAREN_CLOSE
-      || pc->GetType() == CT_TPAREN_CLOSE
-      || pc->GetType() == CT_CLASS_COLON
-      || pc->GetType() == CT_ANGLE_CLOSE
-      || pc->GetType() == CT_SEMICOLON
-      || pc->GetType() == CT_SQUARE_CLOSE)
-   {
-      LOG_FMT(LINDPSE, "ParseFrame::pop (%s:%d): orig line is %4zu, orig col is %4zu, type is %12s, pushed with\n",
-              func, line, pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()));
-   }
-   else if (  pc->GetType() == CT_ACCESS
-           || pc->GetType() == CT_ASSIGN
-           || pc->GetType() == CT_BRACE_OPEN
-           || pc->GetType() == CT_BOOL
-           || pc->GetType() == CT_CASE
-           || pc->GetType() == CT_COMMA
-           || pc->GetType() == CT_COMMENT
-           || pc->GetType() == CT_COMMENT_CPP
-           || pc->GetType() == CT_COMMENT_MULTI
-           || pc->GetType() == CT_COND_COLON
-           || pc->GetType() == CT_FPAREN_OPEN
-           || pc->GetType() == CT_PAREN_OPEN
-           || pc->GetType() == CT_TPAREN_OPEN
-           || pc->GetType() == CT_MACRO_CLOSE
-           || pc->GetType() == CT_MACRO_OPEN
-           || pc->GetType() == CT_NEWLINE
-           || pc->GetType() == CT_NONE
-           || pc->GetType() == CT_OC_END
-           || pc->GetType() == CT_OC_MSG_NAME
-           || pc->GetType() == CT_OC_SCOPE
-           || pc->GetType() == CT_OC_PROPERTY
-           || pc->GetType() == CT_PREPROC
-           || pc->GetType() == CT_SQUARE_OPEN
-           || pc->GetType() == CT_SQL_END
-           || pc->GetType() == CT_TYPEDEF
-           || pc->GetType() == CT_VSEMICOLON
-           || pc->GetType() == CT_WORD)
-   {
-      LOG_FMT(LINDPSE, "ParseFrame::pop (%s:%d): orig line is %4zu, orig col is %4zu, type is %12s\n",
-              func, line, pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()));
-   }
-   else
-   {
-      LOG_FMT(LINDPSE, "ParseFrame::pop (%s:%d): orig line is %4zu, orig col is %4zu, type is %12s,\n",
-              func, line, pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()));
-      LOG_FMT(LINDPSE, "ParseFrame::pop (%s:%d): the type is %s, is not coded. Please make a call.\n",
-              func, line, get_token_name(pc->GetType()));
-      log_flush(true);
-      exit(EX_SOFTWARE);
-   }
-#ifdef DEBUG_PUSH_POP
-   LOG_FMT(LINDPSE, "ParseFrame::pop (%s:%d) Add is %4zu: open_line is %4zu, clos_col is %4zu, type is %12s, "
-           "cpd.level   is %2d, level is %2zu, pse_tos: %2zu -> %2zu\n",
-           func, line, (size_t)this, pse.back().open_line, pse.back().open_colu,
-           get_token_name(pse.back().type), cpd.pp_level, pse.back().level,
-           (pse.size() - 1), (pse.size() - 2));
-#else /* DEBUG_PUSH_POP */
-   LOG_FMT(LINDPSE, "ParseFrame::pop (%s:%d): open_line is %4zu, clos_col is %4zu, type is %12s, "
-           "cpd.level   is %2d, level is %2zu, pse_tos: %2zu -> %2zu\n",
-           func, line, pse.back().open_line, pse.back().open_colu,
-           get_token_name(pse.back().type), cpd.pp_level, pse.back().level,
-           (pse.size() - 1), (pse.size() - 2));
-#endif /* DEBUG_PUSH_POP */
-
-   last_poped = *std::prev(std::end(pse));
-
-   if (pse.size() == 1)
-   {
-      *std::begin(pse) = genDummy();
-   }
-   else
-   {
-      pse.pop_back();
-   }
-} // ParseFrame::pop
-
-
-size_t ParseFrame::size() const
-{
-   // always at least one (dummy) element inside pse guaranteed
-   return(pse.size());
-}
-
-
-const paren_stack_entry_t &ParseFrame::poped() const
-{
-   return(last_poped);
-}
-
-
-// TODO C++14: see abstract versions: std::rend, std::cend, std::crend ...
-ParseFrame::iterator ParseFrame::begin()
-{
-   return(std::begin(pse));
-}
-
-
-ParseFrame::const_iterator ParseFrame::begin() const
-{
-   return(std::begin(pse));
-}
-
-
-ParseFrame::reverse_iterator ParseFrame::rbegin()
-{
-   return(pse.rbegin());
-}
-
-
-ParseFrame::const_reverse_iterator ParseFrame::rbegin() const
-{
-   return(pse.rbegin());
-}
-
-
-ParseFrame::iterator ParseFrame::end()
-{
-   return(std::end(pse));
-}
-
-
-ParseFrame::const_iterator ParseFrame::end() const
-{
-   return(std::end(pse));
-}
-
-
-ParseFrame::reverse_iterator ParseFrame::rend()
-{
-   return(pse.rend());
-}
-
-
-ParseFrame::const_reverse_iterator ParseFrame::rend() const
-{
-   return(pse.rend());
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ParseFrame.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ParseFrame.h
deleted file mode 100644
index 1ca0e2d5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ParseFrame.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * @file ParseFrame.h
- *
- * Container that holds data needed for indenting and brace parsing
- *
- * @author  Daniel Chumak
- * @license GPL v2+
- */
-
-#ifndef SRC_PARSEFRAME_H_
-#define SRC_PARSEFRAME_H_
-
-#include "uncrustify_types.h"
-
-#include <memory>
-
-
-//! Structure for counting nested level
-struct paren_stack_entry_t
-{
-   E_Token       type;         //! the type that opened the entry
-   size_t        level;        //! Level of opening type
-   size_t        open_line;    //! line that open symbol is on, only for logging purposes
-   size_t        open_colu;    //! column that open symbol is on, only for logging purposes
-   Chunk         *pc;          //! Chunk that opened the level, TODO: make const
-   size_t        brace_indent; //! indent for braces - may not relate to indent
-   size_t        indent;       //! indent level (depends on use)
-   size_t        indent_tmp;   //! temporary indent level (depends on use)
-   size_t        indent_tab;   //! the 'tab' indent (always <= real column)
-   bool          indent_cont;  //! indent_continue was applied
-   E_Token       parent;       //! if, for, function, etc
-   brace_stage_e stage;        //! used to check progression of complex statements.
-   bool          in_preproc;   //! whether this was created in a preprocessor
-   size_t        ns_cnt;       //! Number of consecutive namespace levels
-   bool          non_vardef;   //! Hit a non-vardef line
-   T_IndentData  ip;
-   Chunk         *pop_pc;
-};
-
-class ParseFrame
-{
-private:
-   std::vector<paren_stack_entry_t> pse;
-   paren_stack_entry_t              last_poped;
-
-   void clear();
-
-public:
-   size_t  ref_no;
-   size_t  level;             //! level of parens/square/angle/brace
-   size_t  brace_level;       //! level of brace/vbrace
-   size_t  pp_level;          //! level of preproc #if stuff
-   size_t  sparen_count;
-   size_t  paren_count;
-   E_Token in_ifdef;
-   size_t  stmt_count;
-   size_t  expr_count;
-
-
-   ParseFrame();
-   virtual ~ParseFrame() = default;
-
-   bool empty() const;
-
-   paren_stack_entry_t &at(size_t idx);
-   const paren_stack_entry_t &at(size_t idx) const;
-
-   paren_stack_entry_t &prev(size_t idx = 1);
-   const paren_stack_entry_t &prev(size_t idx = 1) const;
-
-   paren_stack_entry_t &top();
-   const paren_stack_entry_t &top() const;
-
-   const paren_stack_entry_t &poped() const;
-
-   void push(Chunk *pc, const char *func, int line, brace_stage_e stage = brace_stage_e::NONE);
-   void push(std::nullptr_t, brace_stage_e stage = brace_stage_e::NONE);
-   void pop(const char *func, int line, Chunk *pc);
-
-   size_t size() const;
-
-   using iterator = std::vector<paren_stack_entry_t>::iterator;
-   iterator begin();
-   iterator end();
-
-   using const_iterator = std::vector<paren_stack_entry_t>::const_iterator;
-   const_iterator begin() const;
-   const_iterator end() const;
-
-   using reverse_iterator = std::vector<paren_stack_entry_t>::reverse_iterator;
-   reverse_iterator rbegin();
-   reverse_iterator rend();
-
-   using const_reverse_iterator = std::vector<paren_stack_entry_t>::const_reverse_iterator;
-   const_reverse_iterator rbegin() const;
-   const_reverse_iterator rend() const;
-};
-
-#endif /* SRC_PARSEFRAME_H_ */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/frame_list.h b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/frame_list.h
deleted file mode 100644
index 5fd09a52..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/frame_list.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @file frame_list.h
- * mainly used to handle preprocessor stuff
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#ifndef PARSE_FRAME_H_INCLUDED
-#define PARSE_FRAME_H_INCLUDED
-
-#include "ParseFrame.h"
-#include "uncrustify_types.h"
-
-
-/**
- * Push a copy of a ParseFrame onto the frames list.
- * This is called on #if and #ifdef.
- */
-void fl_push(std::vector<ParseFrame> &frames, ParseFrame &frm);
-
-
-/**
- * Pop the top element off the frame list and copy it into the ParseFrame.
- *
- * Does nothing if the frame list is empty.
- *
- * This is called on #endif
- */
-void fl_pop(std::vector<ParseFrame> &frames, ParseFrame &pf);
-
-
-// TODO: this name is dumb:
-// - what is it checking?
-// - why does is much more than simple checks, it allters kinds of stuff
-//! Returns the pp_indent to use for this line
-int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, Chunk *pc);
-
-
-#endif /* PARSE_FRAME_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/mark_question_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/mark_question_colon.cpp
deleted file mode 100644
index cd058697..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/mark_question_colon.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * @file mark_question_colon.cpp
- *
- * @author  Guy Maurel
- * @license GPL v2+
- */
-
-#include "mark_question_colon.h"
-
-#include "chunk.h"
-#include "combine_tools.h"
-#include "log_levels.h"
-#include "unc_tools.h"
-
-
-/*
- * Issue #3558
- * will be called if a chunk ? (CT_QUESTION) is entcountered
- * return the chunk :
- * return nullptr is a chunk ; (CT_SEMI_COLON) is found
- */
-Chunk *search_for_colon(Chunk *pc_local)
-{
-   Chunk *pc2;
-
-   LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
-           __func__, __LINE__, pc_local->GetOrigLine(), pc_local->GetOrigCol(), pc_local->GetLevel(), pc_local->Text());
-   Chunk *colon = pc_local->GetNextType(CT_COLON, pc_local->GetLevel());
-
-   if (colon != nullptr)
-   {
-      LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
-              __func__, __LINE__, colon->GetOrigLine(), colon->GetOrigCol(), colon->GetLevel(), colon->Text());
-      colon->SetType(CT_COND_COLON);
-      flag_series(pc_local, colon, PCF_IN_CONDITIONAL);
-
-      // examine the next tokens, search for a next CT_QUESTION
-      for (pc2 = colon->GetNext(); pc2->IsNotNullChunk(); pc2 = pc2->GetNextNcNnl())
-      {
-         LOG_FMT(LCOMBINE, "%s(%d): THE NEXT: orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
-                 __func__, __LINE__, pc2->GetOrigLine(), pc2->GetOrigCol(), pc2->GetLevel(), pc2->Text());
-         pc2->SetFlagBits(PCF_IN_CONDITIONAL);
-         log_pcf_flags(LCOMBINE, pc2->GetFlags());
-
-         if (pc2->Is(CT_SEMICOLON))
-         {
-            LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
-                    __func__, __LINE__, pc2->GetOrigLine(), pc2->GetOrigCol(), pc2->GetLevel(), pc2->Text());
-            return(pc2);
-         }
-         else if (pc2->Is(CT_QUESTION))
-         {
-            LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
-                    __func__, __LINE__, pc2->GetOrigLine(), pc2->GetOrigCol(), pc2->GetLevel(), pc2->Text());
-            pc2 = search_for_colon(pc2);
-            LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
-                    __func__, __LINE__, pc2->GetOrigLine(), pc2->GetOrigCol(), pc2->GetLevel(), pc2->Text());
-            return(pc2);
-         }
-      }
-   }
-   else
-   {
-      LOG_FMT(LWARN, "%s(%d): %zu: Error: Expected a colon\n",
-              __func__, __LINE__, pc_local->GetOrigLine());
-      exit(EX_SOFTWARE);
-   }
-   LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '?'\n",
-           __func__, __LINE__, pc2->GetOrigLine(), pc2->GetOrigCol(), pc2->GetLevel());
-   return(pc2);
-} // search_for_colon
-
-
-void mark_question_colon()
-{
-   LOG_FUNC_ENTRY();
-   Chunk *pc;
-
-   // Issue #3558
-   for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
-   {
-      LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() '%s'\n",
-              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel(), pc->Text());
-      log_pcf_flags(LCOMBINE, pc->GetFlags());
-
-      if (pc->Is(CT_QUESTION))
-      {
-         Chunk *colon = search_for_colon(pc);
-
-         if (colon != nullptr)
-         {
-            LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
-                    __func__, __LINE__, colon->GetOrigLine(), colon->GetOrigCol(), colon->GetLevel(), colon->Text());
-
-            if (colon->Is(CT_SEMICOLON))
-            {
-               // set at the end of the question statement ...
-               pc = colon;
-               LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
-                       __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel(), pc->Text());
-               // ... and go on
-            }
-         }
-         else
-         {
-            LOG_FMT(LWARN, "%s(%d): %zu: Error: Expected a colon\n",
-                    __func__, __LINE__, pc->GetOrigLine());
-            exit(EX_SOFTWARE);
-         }
-      }
-   }
-} // mark_question_colon
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/92.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/92.txt
deleted file mode 100644
index 60a8a584..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/92.txt
+++ /dev/null
@@ -1,196 +0,0 @@
-parse_word : orig line is 1, orig col is 1, Text() is 'struct'
-   type is NONE, parent type is NONE => new type is WORD
-parse_word : orig line is 1, orig col is 1, Text() is 'struct'
-   type is WORD, parent type is NONE => new type is STRUCT
-parse_whitespace : orig line is 1, orig col is 7, Text() is ''
-   type is NONE, parent type is NONE => new type is WHITESPACE
-parse_word : orig line is 1, orig col is 8, Text() is 'TelegramIndex'
-   type is NONE, parent type is NONE => new type is WORD
-parse_whitespace : orig line is 1, orig col is 21, Text() is <Newline>
-   type is NONE, parent type is NONE => new type is NEWLINE
-parse_next : orig line is 2, orig col is 1, Text() is '{'
-   type is NONE, parent type is NONE => new type is BRACE_OPEN
-parse_whitespace : orig line is 2, orig col is 2, Text() is <Newline>
-   type is NONE, parent type is NONE => new type is NEWLINE
-parse_word : orig line is 3, orig col is 1, Text() is 'TelegramIndex'
-   type is NONE, parent type is NONE => new type is WORD
-parse_next : orig line is 3, orig col is 14, Text() is '('
-   type is NONE, parent type is NONE => new type is PAREN_OPEN
-parse_word : orig line is 3, orig col is 15, Text() is 'const'
-   type is NONE, parent type is NONE => new type is WORD
-parse_word : orig line is 3, orig col is 15, Text() is 'const'
-   type is WORD, parent type is NONE => new type is QUALIFIER
-parse_whitespace : orig line is 3, orig col is 20, Text() is ''
-   type is NONE, parent type is NONE => new type is WHITESPACE
-parse_word : orig line is 3, orig col is 21, Text() is 'char'
-   type is NONE, parent type is NONE => new type is WORD
-parse_word : orig line is 3, orig col is 21, Text() is 'char'
-   type is WORD, parent type is NONE => new type is TYPE
-parse_next : orig line is 3, orig col is 25, Text() is '*'
-   type is NONE, parent type is NONE => new type is STAR
-parse_whitespace : orig line is 3, orig col is 26, Text() is ''
-   type is NONE, parent type is NONE => new type is WHITESPACE
-parse_word : orig line is 3, orig col is 27, Text() is 'pN'
-   type is NONE, parent type is NONE => new type is WORD
-parse_next : orig line is 3, orig col is 29, Text() is ','
-   type is NONE, parent type is NONE => new type is COMMA
-parse_whitespace : orig line is 3, orig col is 30, Text() is ''
-   type is NONE, parent type is NONE => new type is WHITESPACE
-parse_word : orig line is 3, orig col is 31, Text() is 'unsigned'
-   type is NONE, parent type is NONE => new type is WORD
-parse_word : orig line is 3, orig col is 31, Text() is 'unsigned'
-   type is WORD, parent type is NONE => new type is TYPE
-parse_whitespace : orig line is 3, orig col is 39, Text() is ''
-   type is NONE, parent type is NONE => new type is WHITESPACE
-parse_word : orig line is 3, orig col is 40, Text() is 'long'
-   type is NONE, parent type is NONE => new type is WORD
-parse_word : orig line is 3, orig col is 40, Text() is 'long'
-   type is WORD, parent type is NONE => new type is TYPE
-parse_whitespace : orig line is 3, orig col is 44, Text() is ''
-   type is NONE, parent type is NONE => new type is WHITESPACE
-parse_word : orig line is 3, orig col is 45, Text() is 'nI'
-   type is NONE, parent type is NONE => new type is WORD
-parse_next : orig line is 3, orig col is 47, Text() is ')'
-   type is NONE, parent type is NONE => new type is PAREN_CLOSE
-parse_whitespace : orig line is 3, orig col is 48, Text() is ''
-   type is NONE, parent type is NONE => new type is WHITESPACE
-parse_next : orig line is 3, orig col is 49, Text() is ':'
-   type is NONE, parent type is NONE => new type is COLON
-parse_whitespace : orig line is 3, orig col is 50, Text() is <Newline>
-   type is NONE, parent type is NONE => new type is NEWLINE
-parse_word : orig line is 4, orig col is 1, Text() is 'pTelName'
-   type is NONE, parent type is NONE => new type is WORD
-parse_next : orig line is 4, orig col is 9, Text() is '('
-   type is NONE, parent type is NONE => new type is PAREN_OPEN
-parse_word : orig line is 4, orig col is 10, Text() is 'pN'
-   type is NONE, parent type is NONE => new type is WORD
-parse_next : orig line is 4, orig col is 12, Text() is ')'
-   type is NONE, parent type is NONE => new type is PAREN_CLOSE
-parse_next : orig line is 4, orig col is 13, Text() is ','
-   type is NONE, parent type is NONE => new type is COMMA
-parse_whitespace : orig line is 4, orig col is 14, Text() is <Newline>
-   type is NONE, parent type is NONE => new type is NEWLINE
-parse_word : orig line is 5, orig col is 1, Text() is 'nTelIndex'
-   type is NONE, parent type is NONE => new type is WORD
-parse_next : orig line is 5, orig col is 10, Text() is '('
-   type is NONE, parent type is NONE => new type is PAREN_OPEN
-parse_word : orig line is 5, orig col is 11, Text() is 'n'
-   type is NONE, parent type is NONE => new type is WORD
-parse_next : orig line is 5, orig col is 12, Text() is ')'
-   type is NONE, parent type is NONE => new type is PAREN_CLOSE
-parse_whitespace : orig line is 5, orig col is 13, Text() is <Newline>
-   type is NONE, parent type is NONE => new type is NEWLINE
-parse_next : orig line is 6, orig col is 1, Text() is '{'
-   type is NONE, parent type is NONE => new type is BRACE_OPEN
-parse_whitespace : orig line is 6, orig col is 2, Text() is <Newline>
-   type is NONE, parent type is NONE => new type is NEWLINE
-parse_next : orig line is 7, orig col is 1, Text() is '}'
-   type is NONE, parent type is NONE => new type is BRACE_CLOSE
-parse_whitespace : orig line is 7, orig col is 2, Text() is <Newline>
-   type is NONE, parent type is NONE => new type is NEWLINE
-parse_next : orig line is 9, orig col is 1, Text() is '~'
-   type is NONE, parent type is NONE => new type is INV
-parse_word : orig line is 9, orig col is 2, Text() is 'TelegramIndex'
-   type is NONE, parent type is NONE => new type is WORD
-parse_next : orig line is 9, orig col is 15, Text() is '('
-   type is NONE, parent type is NONE => new type is PAREN_OPEN
-parse_next : orig line is 9, orig col is 16, Text() is ')'
-   type is NONE, parent type is NONE => new type is PAREN_CLOSE
-parse_whitespace : orig line is 9, orig col is 17, Text() is <Newline>
-   type is NONE, parent type is NONE => new type is NEWLINE
-parse_next : orig line is 10, orig col is 1, Text() is '{'
-   type is NONE, parent type is NONE => new type is BRACE_OPEN
-parse_whitespace : orig line is 10, orig col is 2, Text() is <Newline>
-   type is NONE, parent type is NONE => new type is NEWLINE
-parse_next : orig line is 11, orig col is 1, Text() is '}'
-   type is NONE, parent type is NONE => new type is BRACE_CLOSE
-parse_whitespace : orig line is 11, orig col is 2, Text() is <Newline>
-   type is NONE, parent type is NONE => new type is NEWLINE
-parse_word : orig line is 13, orig col is 1, Text() is 'const'
-   type is NONE, parent type is NONE => new type is WORD
-parse_word : orig line is 13, orig col is 1, Text() is 'const'
-   type is WORD, parent type is NONE => new type is QUALIFIER
-parse_whitespace : orig line is 13, orig col is 6, Text() is ''
-   type is NONE, parent type is NONE => new type is WHITESPACE
-parse_word : orig line is 13, orig col is 7, Text() is 'char'
-   type is NONE, parent type is NONE => new type is WORD
-parse_word : orig line is 13, orig col is 7, Text() is 'char'
-   type is WORD, parent type is NONE => new type is TYPE
-parse_next : orig line is 13, orig col is 11, Text() is '*'
-   type is NONE, parent type is NONE => new type is STAR
-parse_whitespace : orig line is 13, orig col is 12, Text() is ''
-   type is NONE, parent type is NONE => new type is WHITESPACE
-parse_word : orig line is 13, orig col is 13, Text() is 'const'
-   type is NONE, parent type is NONE => new type is WORD
-parse_word : orig line is 13, orig col is 13, Text() is 'const'
-   type is WORD, parent type is NONE => new type is QUALIFIER
-parse_whitespace : orig line is 13, orig col is 18, Text() is ''
-   type is NONE, parent type is NONE => new type is WHITESPACE
-parse_word : orig line is 13, orig col is 19, Text() is 'pTelName'
-   type is NONE, parent type is NONE => new type is WORD
-parse_next : orig line is 13, orig col is 27, Text() is ';'
-   type is NONE, parent type is NONE => new type is SEMICOLON
-parse_whitespace : orig line is 13, orig col is 28, Text() is <Newline>
-   type is NONE, parent type is NONE => new type is NEWLINE
-parse_word : orig line is 14, orig col is 1, Text() is 'unsigned'
-   type is NONE, parent type is NONE => new type is WORD
-parse_word : orig line is 14, orig col is 1, Text() is 'unsigned'
-   type is WORD, parent type is NONE => new type is TYPE
-parse_whitespace : orig line is 14, orig col is 9, Text() is ''
-   type is NONE, parent type is NONE => new type is WHITESPACE
-parse_word : orig line is 14, orig col is 10, Text() is 'long'
-   type is NONE, parent type is NONE => new type is WORD
-parse_word : orig line is 14, orig col is 10, Text() is 'long'
-   type is WORD, parent type is NONE => new type is TYPE
-parse_whitespace : orig line is 14, orig col is 14, Text() is ''
-   type is NONE, parent type is NONE => new type is WHITESPACE
-parse_word : orig line is 14, orig col is 15, Text() is 'nTelIndex'
-   type is NONE, parent type is NONE => new type is WORD
-parse_next : orig line is 14, orig col is 24, Text() is ';'
-   type is NONE, parent type is NONE => new type is SEMICOLON
-parse_whitespace : orig line is 14, orig col is 25, Text() is <Newline>
-   type is NONE, parent type is NONE => new type is NEWLINE
-parse_next : orig line is 15, orig col is 1, Text() is '}'
-   type is NONE, parent type is NONE => new type is BRACE_CLOSE
-parse_next : orig line is 15, orig col is 2, Text() is ';'
-   type is NONE, parent type is NONE => new type is SEMICOLON
-parse_whitespace : orig line is 15, orig col is 3, Text() is <Newline>
-   type is NONE, parent type is NONE => new type is NEWLINE
-tokenize_cleanup : orig line is 1, orig col is 8, Text() is 'TelegramIndex'
-   type is WORD, parent type is NONE => new type is TYPE
-tokenize_cleanup : orig line is 3, orig col is 25, Text() is '*'
-   type is STAR, parent type is NONE => new type is PTR_TYPE
-tokenize_cleanup : orig line is 13, orig col is 11, Text() is '*'
-   type is STAR, parent type is NONE => new type is PTR_TYPE
-try_find_end_chunk : orig line is 1, orig col is 8, Text() is 'TelegramIndex'
-   type is TYPE, parent type is NONE => new type is WORD
-make_type : orig line is 1, orig col is 8, Text() is 'TelegramIndex'
-   type is WORD, parent type is NONE => new type is TYPE
-mark_constructors : orig line is 3, orig col is 1, Text() is 'TelegramIndex'
-   type is WORD, parent type is NONE => new type is FUNC_CLASS_DEF
-flag_parens : orig line is 3, orig col is 14, Text() is '('
-   type is PAREN_OPEN, parent type is NONE => new type is FPAREN_OPEN
-flag_parens : orig line is 3, orig col is 47, Text() is ')'
-   type is PAREN_CLOSE, parent type is NONE => new type is FPAREN_CLOSE
-mark_cpp_constructor : orig line is 3, orig col is 49, Text() is ':'
-   type is COLON, parent type is NONE => new type is CONSTR_COLON
-mark_cpp_constructor : orig line is 4, orig col is 1, Text() is 'pTelName'
-   type is WORD, parent type is NONE => new type is FUNC_CTOR_VAR
-flag_parens : orig line is 4, orig col is 9, Text() is '('
-   type is PAREN_OPEN, parent type is NONE => new type is FPAREN_OPEN
-flag_parens : orig line is 4, orig col is 12, Text() is ')'
-   type is PAREN_CLOSE, parent type is NONE => new type is FPAREN_CLOSE
-mark_cpp_constructor : orig line is 5, orig col is 1, Text() is 'nTelIndex'
-   type is WORD, parent type is NONE => new type is FUNC_CTOR_VAR
-flag_parens : orig line is 5, orig col is 10, Text() is '('
-   type is PAREN_OPEN, parent type is NONE => new type is FPAREN_OPEN
-flag_parens : orig line is 5, orig col is 12, Text() is ')'
-   type is PAREN_CLOSE, parent type is NONE => new type is FPAREN_CLOSE
-mark_constructors : orig line is 9, orig col is 2, Text() is 'TelegramIndex'
-   type is WORD, parent type is NONE => new type is FUNC_CLASS_DEF
-mark_cpp_constructor : orig line is 9, orig col is 1, Text() is '~'
-   type is INV, parent type is NONE => new type is DESTRUCTOR
-flag_parens : orig line is 9, orig col is 15, Text() is '('
-   type is PAREN_OPEN, parent type is NONE => new type is FPAREN_OPEN
-flag_parens : orig line is 9, orig col is 16, Text() is ')'
-   type is PAREN_CLOSE, parent type is NONE => new type is FPAREN_CLOSE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/replace.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/replace.txt
deleted file mode 100644
index 91bffadc..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/replace.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-do_source_file(1524): Parsing: input/I-3310.c as language C
-do_source_file(1524): Parsing: input/backup.h as language C-Header
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/tracking_space.html b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/tracking_space.html
deleted file mode 100644
index b0098a0e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/tracking_space.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<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.76.0/tests/config/c/ben_085.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_085.cfg
deleted file mode 100644
index b02673d7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_085.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-sp_paren_paren                  = remove
-sp_inside_fparen                = remove
-indent_columns                  = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/label_colon_nl_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/label_colon_nl_1.cfg
deleted file mode 100644
index 5c394f28..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/label_colon_nl_1.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-nl_before_case                  = true
-nl_after_semicolon              = true
-nl_after_label_colon            = true
-nl_remove_extra_newlines        = 2
-align_var_struct_span           = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/label_colon_nl_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/label_colon_nl_2.cfg
deleted file mode 100644
index b1fafca7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/label_colon_nl_2.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-nl_before_case                  = true
-nl_after_semicolon              = true
-nl_remove_extra_newlines        = 2
-align_var_struct_span           = 3
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-1.cfg
deleted file mode 100644
index d387a19e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-1.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_infinite_loop = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-2.cfg
deleted file mode 100644
index bd311daf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-2.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_infinite_loop = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-4.cfg
deleted file mode 100644
index 07388b83..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-4.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_infinite_loop = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/d.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/d.cfg
deleted file mode 100644
index d45001c5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/d.cfg
+++ /dev/null
@@ -1,50 +0,0 @@
-sp_before_semi_for              = remove
-sp_arith                        = force
-sp_assign                       = force
-sp_compare                      = force
-sp_inside_paren                 = remove
-sp_paren_paren                  = remove
-sp_before_ptr_star              = force
-sp_between_ptr_star             = remove
-sp_after_ptr_star               = remove
-sp_after_ptr_star_func          = remove
-sp_before_sparen                = force
-sp_inside_sparen                = remove
-sp_inside_for                   = remove
-sp_before_square                = remove
-sp_before_squares               = remove
-sp_after_comma                  = force
-sp_after_cast                   = remove
-sp_func_proto_paren             = remove
-sp_func_def_paren               = remove
-sp_inside_fparen                = remove
-sp_func_call_paren              = remove
-sp_range                        = force
-sp_while_paren_open             = force
-indent_columns                  = 4
-indent_with_tabs                = 0
-indent_class                    = true
-indent_case_brace               = 4
-indent_label                    = 2
-nl_var_def_blk_end_func_top     = 1
-nl_var_def_blk_end              = 1
-nl_enum_brace                   = add
-nl_if_brace                     = add
-nl_else_brace                   = add
-nl_else_if                      = remove
-nl_for_brace                    = add
-nl_before_case                  = true
-nl_fdef_brace                   = add
-nl_after_brace_open             = true
-eat_blanks_after_open_brace     = true
-eat_blanks_before_close_brace   = true
-nl_after_return                 = true
-align_var_def_span              = 2
-align_var_def_star_style        = 1
-align_assign_span               = 1
-align_enum_equ_span             = 4
-align_var_class_span            = 2
-align_typedef_gap               = 3
-align_typedef_span              = 5
-align_typedef_star_style        = 1
-align_right_cmt_span            = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_inside_fparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_inside_fparen-f.cfg
deleted file mode 100644
index 2b159a36..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_inside_fparen-f.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_inside_fparen                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_031.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_031.cfg
deleted file mode 100644
index fe2182c9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_031.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 3
-indent_class                    = true
-indent_label                    = 2
-indent_access_spec              = 2
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_full_brace_if_chain-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_full_brace_if_chain-1.cfg
deleted file mode 100644
index a0b0f5d3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_full_brace_if_chain-1.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_full_brace_if_chain         = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_full_brace_if_chain-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_full_brace_if_chain-2.cfg
deleted file mode 100644
index c78f179b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_full_brace_if_chain-2.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_full_brace_if_chain         = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_full_brace_if_chain-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_full_brace_if_chain-3.cfg
deleted file mode 100644
index dd552dd0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_full_brace_if_chain-3.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_full_brace_if_chain         = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_brace_catch.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_brace_catch.cfg
deleted file mode 100644
index 7ee0209d..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_brace_catch.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_brace_catch = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_catch_brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_catch_brace.cfg
deleted file mode 100644
index d2da6d91..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_catch_brace.cfg
+++ /dev/null
@@ -1 +0,0 @@
-sp_catch_brace = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34508-Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34508-Issue_3220.cpp
deleted file mode 100644
index aba03416..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34508-Issue_3220.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-int*   b;
-auto Func2(Model*      model) -> Color                  *  *    const;
-auto Func2(Model*   model) -> Color   *   *        const {
-        return nullptr;
-}
-int    *    Funcf(Model*   model, int*  *);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.editorconfig b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.editorconfig
index 05c9fc6c..05c9fc6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.editorconfig
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.editorconfig
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.gitattributes b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.gitattributes
index 5ef989a3..5ef989a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.gitattributes
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.gitattributes
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.github/ISSUE_TEMPLATE b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.github/ISSUE_TEMPLATE
index d98e5cf5..d98e5cf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.github/ISSUE_TEMPLATE
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.github/ISSUE_TEMPLATE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.github/workflows/uncrustify_test.yml b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.github/workflows/uncrustify_test.yml
index 00e972ff..00e972ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.github/workflows/uncrustify_test.yml
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.github/workflows/uncrustify_test.yml
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.gitignore b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.gitignore
index 098b0695..098b0695 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.gitignore
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.gitignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.pc/.quilt_patches b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.pc/.quilt_patches
new file mode 100644
index 00000000..6857a8d4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.pc/.quilt_series b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.pc/.quilt_series
new file mode 100644
index 00000000..c2067066
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.pc/.version b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.pc/.version
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.travis.yml b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.travis.yml
index a3bfcf7a..a3bfcf7a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/.travis.yml
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/.travis.yml
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/AUTHORS b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/AUTHORS
index 6c01a700..5d2c147f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/AUTHORS
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/AUTHORS
@@ -31,6 +31,7 @@ Biswapriyo Nath
 B. Kevin Hardman
 Bogdan Popescu
 Brandon Slack
+Brecht Sanders
 Brendan Long
 Brian Kelley
 CharlieYJH
@@ -74,6 +75,7 @@ Ilya Lyubimov
 Ingo Brückl
 Ivan Nazarenko
 Ivan Romanov
+Jakub Lukasiewicz
 Jakub Schmidtke
 Jan Weiß
 Jason
@@ -88,6 +90,7 @@ Joel Ostraat
 Joergen Ibsen
 Johnny Oskarsson
 Jonas Hurrelmann
+Jorengarenar
 Joshua Gross
 Joshua Parker
 Julian Picht
@@ -102,12 +105,14 @@ Leon Breedt
 Lorenz Haas
 Lykurg
 Maciej Bogusz
+Manning, James
 Marco Stephan
 Marcus Nilsson
 Marek Fort
 Marius Zwicker
 Mark Stegeman
 Markus Geimer
+Martin Delille
 Martin Simonovsky
 Martin Storsjo
 Matthew McDole
@@ -157,6 +162,7 @@ Samish Chandra Kolli
 Samish Kolli
 Scott Bilas
 Sebastian Andersson
+Sebastian Bilek
 S. Gilles
 Shazron Abdullah
 Siddharth Kannan
@@ -180,3 +186,4 @@ Vojtěch Balík
 Vyacheslav Shegai
 Waldir Pimenta
 Yannick Bühler
+Yegor Yefremov
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/BUGS b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/BUGS
index a6e2ccaa..a6e2ccaa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/BUGS
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/BUGS
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/CMakeLists.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/CMakeLists.txt
index 2e288f01..2ea7cbe7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/CMakeLists.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.5)
 
 project(uncrustify)
 
@@ -56,7 +56,7 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
   endif()
   unset(gcc_warning_flags)
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-deprecated-declarations")
 endif()
 
 set(CMAKE_CXX_STANDARD 11)
@@ -138,7 +138,7 @@ endif()
 # Generate uncrustify_version.h
 #
 
-set(UNCRUSTIFY_VERSION "0.76.0_f")
+set(UNCRUSTIFY_VERSION "0.78.0_f")
 
 option(NoGitVersionString "Do not use make_version.py and git to build a version string" OFF)
 if(NoGitVersionString)
@@ -270,6 +270,7 @@ set(uncrustify_sources
   src/braces.cpp
   src/calculate_closing_brace_position.cpp
   src/change_int_types.cpp
+  src/check_template.cpp
   src/chunk.cpp
   src/ChunkStack.cpp
   src/combine.cpp
@@ -287,14 +288,15 @@ set(uncrustify_sources
   src/flag_braced_init_list.cpp
   src/flag_decltype.cpp
   src/flag_parens.cpp
-  src/frame_list.cpp
   src/indent.cpp
   src/keywords.cpp
   src/lang_pawn.cpp
+  src/language_names.cpp
   src/language_tools.cpp
   src/logger.cpp
   src/logmask.cpp
   src/log_rules.cpp
+  src/mark_functor.cpp
   src/mark_question_colon.cpp
   src/md5.cpp
   src/newlines.cpp
@@ -304,7 +306,8 @@ set(uncrustify_sources
   src/parameter_pack_cleanup.cpp
   src/parens.cpp
   src/parent_for_pp.cpp
-  src/ParseFrame.cpp
+  src/parsing_frame.cpp
+  src/parsing_frame_stack.cpp
   src/pragma_cleanup.cpp
   src/pcf_flags.cpp
   src/punctuators.cpp
@@ -364,6 +367,7 @@ set(uncrustify_headers
   src/calculate_closing_brace_position.h
   src/change_int_types.h
   src/char_table.h
+  src/check_template.h
   src/chunk.h
   src/ChunkStack.h
   src/combine.h
@@ -380,16 +384,17 @@ set(uncrustify_headers
   src/flag_braced_init_list.h
   src/flag_decltype.h
   src/flag_parens.h
-  src/frame_list.h
   src/indent.h
   src/keywords.h
   src/lang_pawn.h
+  src/language_names.h
   src/language_tools.h
   src/ListManager.h
   src/logger.h
   src/log_levels.h
   src/logmask.h
   src/log_rules.h
+  src/mark_functor.h
   src/mark_question_colon.h
   src/md5.h
   src/newlines.h
@@ -400,7 +405,8 @@ set(uncrustify_headers
   src/parameter_pack_cleanup.h
   src/parens.h
   src/parent_for_pp.h
-  src/ParseFrame.h
+  src/parsing_frame.h
+  src/parsing_frame_stack.h
   src/pragma_cleanup.h
   src/pcf_flags.h
   src/prototypes.h
@@ -543,7 +549,10 @@ endif()
 #
 # Uninstall
 #
-add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${PROJECT_SOURCE_DIR}/cmake/uninstall.cmake")
+get_directory_property(hasParent PARENT_DIRECTORY)
+if(NOT hasParent)
+  add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${PROJECT_SOURCE_DIR}/cmake/uninstall.cmake")
+endif()
 
 #
 # add to build the compile_commands.json file, to be used by clang-tidy
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/CODEOWNERS b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/CODEOWNERS
index c29e4a1f..c29e4a1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/CODEOWNERS
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/CODEOWNERS
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/CONTRIBUTING.md b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/CONTRIBUTING.md
index 8a43f8a8..c5766bd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/CONTRIBUTING.md
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/CONTRIBUTING.md
@@ -67,6 +67,10 @@ There are lots of ways to contribute to Uncrustify:
       Changes without tests should explain why tests are not present.
       (Changes that are non-functional, such as documentation changes,
       can usually omit tests without justification.)
+    - Any updates to `src/options.h`, including option descriptions, should be
+      accompanied by an update of the option documentation. This can be done by
+      building uncrustify and then running:
+      `./scripts/release_tool.py optiondocs path_to_uncrustify_binary`
 
 * Prepare a Pull Request (PR):
     - To reduce the likelihood of conflicts and test failures,
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/COPYING b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/COPYING
index d60c31a9..d60c31a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/COPYING
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/COPYING
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/ChangeLog b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/ChangeLog
index 6f9294b5..a4492cf9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/ChangeLog
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/ChangeLog
@@ -1,3 +1,49 @@
+Change highlights in uncrustify-0.78.0 (November 2023)
+-------------------------------------------------------------------------------
+   50b364e02d4e6ebe5fa99d2d1de642f1a3fb6570
+     Added   : align_nl_cont_spaces                 May 11 2023
+   7c53d3cc66d939dc5b0de25868e947508e2353d5
+     Added   : sp_after_bit_colon                   Jun 28 2023
+     Added   : sp_before_bit_colon                  Jun 28 2023
+   b4af21a59630315f79ec28bc5449c31f48194111
+     Added   : sp_between_ptr_ref                   Jul 14 2023
+   84780fef16da0552e7f44785d63d23a2b0e6a8b4
+     Added   : nl_min_after_func_body               Aug  3 2023
+   d8931537292a5cb897cfd561adf581d27087bfe4
+     Added   : sp_before_keyword_ptr_star           Aug 10 2023
+   8ffe999d3382c6f516372627bd529917bc6611ae
+     Added   : sp_before_global_scope_ptr_star      Aug 10 2023
+     Added   : sp_before_scope_ptr_star             Aug 10 2023
+   f493e4d9e003648753e6574ba2cd61f5c0bd1352
+     Added   : sp_before_operator_ptr_star          Aug 10 2023
+     Added   : sp_before_qualifier_ptr_star         Aug 10 2023
+     Removed : sp_before_keyword_ptr_star           Aug 10 2023
+   adbb82b0f6e551ef976e64a1351ca0eb05acf932
+     Added   : debug_use_the_exit_function_pop      Aug 15 2023
+   2e0e019dc28cac0844b5cff81d05859ee1a02394
+     Added   : nl_max_after_func_body               Aug 28 2023
+   cb44fe733a2c1e0391cfa5afdac77f7e66d688e1
+     Added   : sp_cpp_lambda_argument_list_empty    Sep 12 2023
+   e058aafd4ee5e407e250a6b921886d2c00d6a622
+     Added   : align_func_proto_span_ignore_cont_lines Oct 21 2023
+
+Change highlights in uncrustify-0.77.0 (May 2023)
+-------------------------------------------------------------------------------
+   ea6c54eefe2f3272a4867d30920408c327167199
+     Added   : sp_cmt_cpp_pvs                       Jan 28 2023
+   74cf6ca40a0ce1b0d2499a92128ccde34bb48428
+     Added   : sp_inside_rparen                     Feb 15 2023
+     Added   : sp_func_call_user_inside_rparen      Feb 15 2023
+     Added   : sp_inside_rparens                    Feb 15 2023
+   70fac8d68b8a697132a21c5c59a09fd91e0a0486
+     Added   : sp_cmt_cpp_lint                      Mar 18 2023
+   73d9ab72ce736e9689f56406302f6d62ddfc3835
+     Added   : sp_qualifier_ptr_star_trailing       Apr 13 2023
+     Added   : sp_qualifier_unnamed_ptr_star        Apr 13 2023
+     Added   : sp_qualifier_ptr_star_func           Apr 13 2023
+   8b639a0b31637204da3d17dc29cc659def6f4cf7
+     Added   : mod_add_force_c_closebrace_comment   Apr 19 2023
+
 Change highlights in uncrustify-0.76.0 (November 2022)
 -------------------------------------------------------------------------------
    1aea3d1fcb55dc2ca40dfe2b1d548685a415ef3a
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/Comments.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/Comments.txt
index b4696a3e..b4696a3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/Comments.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/Comments.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/HELP b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/HELP
index 83792fa5..83792fa5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/HELP
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/HELP
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/LIMITATIONS.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/LIMITATIONS.txt
index a49f23f2..a49f23f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/LIMITATIONS.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/LIMITATIONS.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/NEWS b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/NEWS
index 8b6344a0..8b6344a0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/NEWS
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/NEWS
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/README.md b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/README.md
index 08d3fd43..c8cac867 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/README.md
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/README.md
@@ -1,6 +1,7 @@
 [![AppVeyor](https://img.shields.io/appveyor/ci/uncrustify/uncrustify/master.svg?style=flat-square&label=Windows)](https://ci.appveyor.com/project/uncrustify/uncrustify)
 [![Coverage Status](https://coveralls.io/repos/github/uncrustify/uncrustify/badge.svg?branch=master)](https://coveralls.io/github/uncrustify/uncrustify?branch=master)
 <a href="#"><img src="https://img.shields.io/badge/C++-11-blue.svg?style=flat-square"></a>
+[![Conan Center](https://shields.io/conan/v/uncrustify)](https://conan.io/center/uncrustify)
 
 ---------------------------
 
@@ -8,7 +9,7 @@
 A source code beautifier for C, C++, C#, Objective-C, D, Java, Pawn and Vala.
 
 ## Features
-* Highly configurable - 828 configurable options as of version 0.76.0
+* Highly configurable - 850 configurable options as of version 0.78.0
 - <details><summary>add/remove spaces</summary>
 
   - `sp_before_sparen`: _Add or remove space before '(' of 'if', 'for', 'switch', 'while', etc._
@@ -192,7 +193,7 @@ on the subdirectories of that folder.
 
 If a PR is altering the CLI output, files inside those directories might
 need to be manually updated. This often happens when options are
-added, removed or altered. Keep in mind that the version string line
+added, removed, or altered. Keep in mind that the version string line
 (example: `# Uncrustify-0.69.0_f`) of outputs from commands like
 `--show-config` should be replaced with a blank line.
 
@@ -322,7 +323,7 @@ The `-f` flag specifies the input file.
 The `-o` flag specifies the output file.
 If flag `-f` is used without flag `-o` the output will be send to `stdout`.
 
-Alternatively multiple or single files that should be processed can be
+Alternatively, multiple or single files that should be processed can be
 specified at the command end without flags.
 If the flag `--no-backup` is missing, every file is saved with the initial
 name and an additional suffix (can be changed with --suffix).
@@ -334,7 +335,7 @@ $ uncrustify -h
 
 ## Configuring the program
 Uncrustify usually reads configuration files that are passed via the `-c`
-flag. If the flag is not provided Uncrustify will try to find a
+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.cfg` or `uncrustify.cfg` in your home folder.
 
@@ -355,7 +356,7 @@ To get a list of:
   uncrustify --update-config-with-doc
   ```
 
-  As the names suggest both options can produce output that adds newly
+  As the names suggest, both options can produce output that adds newly
   introduced options to your old configuration file. For this your old
   configuration file has to be passed via the `-c` flag:
   ```bash
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/TESTING b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/TESTING
index 63efbff7..63efbff7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/TESTING
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/TESTING
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/appveyor.yml b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/appveyor.yml
index 1bdd8d4c..1bdd8d4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/appveyor.yml
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/appveyor.yml
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/CodeCoverage.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/cmake/CodeCoverage.cmake
index 670c5144..670c5144 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/CodeCoverage.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/cmake/CodeCoverage.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/GenerateTokenNames.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/cmake/GenerateTokenNames.cmake
index 02a6241a..02a6241a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/GenerateTokenNames.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/cmake/GenerateTokenNames.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/GenerateVersionHeader.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/cmake/GenerateVersionHeader.cmake
index 3d6d376b..3d6d376b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/GenerateVersionHeader.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/cmake/GenerateVersionHeader.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/Toolchain-mingw32.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/cmake/Toolchain-mingw32.cmake
index c220975c..c220975c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/Toolchain-mingw32.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/cmake/Toolchain-mingw32.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/Toolchain-mingw64.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/cmake/Toolchain-mingw64.cmake
index bc1a666e..bc1a666e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/Toolchain-mingw64.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/cmake/Toolchain-mingw64.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/uninstall.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/cmake/uninstall.cmake
index b9618a29..b9618a29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/cmake/uninstall.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/cmake/uninstall.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/commit.log b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/commit.log
index 1a725f4e..1a725f4e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/commit.log
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/commit.log
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/coverity.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/coverity.sh
index e52a3594..e52a3594 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/coverity.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/coverity.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/coverity.travis.yml b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/coverity.travis.yml
index ef306e8c..ef306e8c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/coverity.travis.yml
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/coverity.travis.yml
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/cdbs/debian-tde.mk b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/cdbs/debian-tde.mk
index f36e3527..b031e698 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/cdbs/debian-tde.mk
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ 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
+DEB_COMPRESS_EXCLUDE_ALL += .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 | \
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/cdbs/versions.pl b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/cdbs/versions.pl
index 1b110f7a..1b110f7a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/cdbs/versions.pl
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/cdbs/versions.pl
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/changelog b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/changelog
index 24a63b55..0e7ef0c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/changelog
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/changelog
@@ -1,3 +1,9 @@
+uncrustify-trinity (0.78.0-0debian13.0.0+0) unstable; urgency=medium
+
+  * TDE version of upstream 0.78.0
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Sun, 18 Nov 2023 17:35:00 +0900
+
 uncrustify-trinity (0.76.0-0debian12.0.0+0) unstable; urgency=medium
 
   * TDE version of upstream 0.76.0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/compat b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/compat
new file mode 100644
index 00000000..f599e28b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/control b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/control
index 21e39cb0..21e39cb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/control
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/control
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/copyright b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/copyright
index 7c74f673..7c74f673 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/copyright
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/copyright
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/docs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/docs
index 3310d30d..3310d30d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/docs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/docs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/001_docs-remove-remote-images.patch b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/patches/001_docs-remove-remote-images.patch
index 9c7d3e3b..9c7d3e3b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/001_docs-remove-remote-images.patch
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/patches/001_docs-remove-remote-images.patch
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/002_trinity_customization.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/patches/002_trinity_customization.diff
index 4a070a0c..16acca5d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/002_trinity_customization.diff
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/patches/002_trinity_customization.diff
@@ -2,7 +2,7 @@ Customize and repackage as a TDE package.
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -1,6 +1,6 @@
- cmake_minimum_required(VERSION 3.2)
+ cmake_minimum_required(VERSION 3.5)
  
 -project(uncrustify)
 +project(uncrustify-trinity)
@@ -18,7 +18,7 @@ Customize and repackage as a TDE package.
    src/align_add.cpp
    src/align_asm_colon.cpp
    src/align_assign.cpp
-@@ -330,7 +330,7 @@
+@@ -333,7 +333,7 @@
    ${PROJECT_BINARY_DIR}/src/option_enum.cpp
  )
  
@@ -27,7 +27,7 @@ Customize and repackage as a TDE package.
    src/add_space_table.h
    src/align_add.h
    src/align_asm_colon.h
-@@ -430,7 +430,7 @@
+@@ -436,7 +436,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"
-@@ -439,17 +439,17 @@
+@@ -445,17 +445,17 @@
    "${PROJECT_SOURCE_DIR}/README.md"
  )
  
@@ -59,7 +59,7 @@ Customize and repackage as a TDE package.
  
  #
  # Generate uncrustify.xml (katepart highlighting file)
-@@ -471,7 +471,7 @@
+@@ -477,7 +477,7 @@
  #
  OPTION(ENABLE_CODECOVERAGE "Enable code coverage testing support")
  if(ENABLE_CODECOVERAGE)
@@ -68,7 +68,7 @@ Customize and repackage as a TDE package.
      include(${CMAKE_SOURCE_DIR}/cmake/CodeCoverage.cmake)
  endif(ENABLE_CODECOVERAGE)
  
-@@ -479,10 +479,10 @@
+@@ -485,10 +485,10 @@
  # Build command to run uncrustify on its own sources
  #
  add_custom_target(format-sources)
@@ -81,7 +81,7 @@ Customize and repackage as a TDE package.
        -c forUncrustifySources.cfg
        -lCPP --no-backup ${source}
      COMMENT "Formatting ${source}"
-@@ -494,7 +494,7 @@
+@@ -500,7 +500,7 @@
  #
  # Package
  #
@@ -90,7 +90,7 @@ 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")
-@@ -512,8 +512,8 @@
+@@ -518,8 +518,8 @@
  # Install
  #
  if(MSVC)
@@ -101,7 +101,7 @@ Customize and repackage as a TDE package.
      DESTINATION "."
    )
    install(FILES "${PROJECT_SOURCE_DIR}/documentation/htdocs/index.html"
-@@ -525,17 +525,17 @@
+@@ -531,17 +531,17 @@
    )
  else()
    include(GNUInstallDirs)
@@ -186,7 +186,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
-@@ -492,16 +492,16 @@
+@@ -525,16 +525,16 @@
      bd_dir = parsed_args.build
      test_dir = parsed_args.test
  
@@ -212,4 +212,4 @@ Customize and repackage as a TDE package.
 +                 s_path_join(bd_dir, 'MinSizeRel/uncrustify-trinity.exe')]
      for uncr_bin in bin_paths:
          if not isfile(uncr_bin):
-             eprint("is not a file: %s" % uncr_bin)
+             eprint("is 3 not a file: %s" % uncr_bin)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/004_fixed_usage.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/patches/003_fixed_usage.diff
index b23b40e2..55d2454f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/004_fixed_usage.diff
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/patches/003_fixed_usage.diff
@@ -1,7 +1,7 @@
 Fixed usage message to match uncrustify-trinity.
 --- a/src/uncrustify.cpp
 +++ b/src/uncrustify.cpp
-@@ -307,15 +307,15 @@
+@@ -303,15 +303,15 @@
             "                         Cannot be used with the -o option'\n"
             "\n"
             "Usage Examples\n"
@@ -28,7 +28,7 @@ Fixed usage message to match uncrustify-trinity.
             "      processing of parts of the source file (these can be overridden with\n"
 --- a/tests/cli/output/help.txt
 +++ b/tests/cli/output/help.txt
-@@ -66,15 +66,15 @@
+@@ -67,15 +67,15 @@
                           Cannot be used with the -o option'
  
  Usage Examples
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/series b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/patches/series
index 383a9d11..9bd2c227 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/patches/series
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/patches/series
@@ -1,4 +1,3 @@
 001_docs-remove-remote-images.patch
 002_trinity_customization.diff
-003_allow_older_distributions.diff
-004_fixed_usage.diff
+003_fixed_usage.diff
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/rules b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/rules
index dd013fa1..921af9c1 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/rules
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/rules
@@ -15,5 +15,5 @@ DEB_CMAKE_EXTRA_FLAGS := \
 DEB_MAKE_CHECK_TARGET = test
 
 DEB_MAKE_ENVVARS += PYTHONPYCACHEPREFIX=${DEB_DESTDIR}../../${DEB_BUILDDIR}/__pycache__
-DEB_MAKE_ENVVARS += CTEST_PARALLEL_LEVEL=4
+DEB_MAKE_ENVVARS += CTEST_PARALLEL_LEVEL=6
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/source/format b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/source/format
index 163aaf8d..163aaf8d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/source/format
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/source/format
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/source/options b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/source/options
index d71748bb..72f1f545 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/debian/source/options
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/debian/source/options
@@ -1,3 +1,6 @@
 # Use xz instead of gzip
 compression = "xz"
 compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/Conditional_operator.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/Conditional_operator.txt
new file mode 100644
index 00000000..a9448718
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/Conditional_operator.txt
@@ -0,0 +1,7 @@
+The bug https://github.com/uncrustify/uncrustify/issues/1130
+shows the problem with the conditional operator ?
+indent_ternary_operator not aligning correctly.
+
+The solution is to transform the simple call to a recursiv call.
+The position of ? must be saved for each level and be used to
+position the colon operator.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/Conditional_operator.txt-save b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/Conditional_operator.txt-save
new file mode 100644
index 00000000..a9448718
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/Conditional_operator.txt-save
@@ -0,0 +1,7 @@
+The bug https://github.com/uncrustify/uncrustify/issues/1130
+shows the problem with the conditional operator ?
+indent_ternary_operator not aligning correctly.
+
+The solution is to transform the simple call to a recursiv call.
+The position of ? must be saved for each level and be used to
+position the colon operator.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/Track.jpg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/Track.jpg
index b18b0477..b18b0477 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/Track.jpg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/Track.jpg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/Tracking.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/Tracking.txt
index fc101eba..1a428044 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/Tracking.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/Tracking.txt
@@ -7,7 +7,9 @@ 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
+uncrustify --tracking space:Track.html -c config-FILE -f source-FILE -L A 2>A.txt
+uncrustify --tracking nl:Track.html    -c config-FILE -f source-FILE -L A 2>A.txt
+uncrustify --tracking start: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 written in the Track.html file and the output file A.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/align-thresholds.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/align-thresholds.txt
index 5c18039d..5c18039d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/align-thresholds.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/align-thresholds.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/control_the_spaces.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/control_the_spaces.txt
index 8ea2ac52..8ea2ac52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/control_the_spaces.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/control_the_spaces.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/dump-steps.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/dump-steps.txt
index 498a147e..498a147e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/dump-steps.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/dump-steps.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/example.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/example.c
index 7c8edf79..7c8edf79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/example.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/example.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/goals.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/goals.txt
index 610ec121..610ec121 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/goals.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/goals.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/how_to_configure_options.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/how_to_configure_options.txt
index 2f0eee4e..2f0eee4e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/how_to_configure_options.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/how_to_configure_options.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/how_to_format_cpp_lambda_functions.rst b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/how_to_format_cpp_lambda_functions.rst
index e15776d4..e15776d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/how_to_format_cpp_lambda_functions.rst
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/how_to_format_cpp_lambda_functions.rst
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/align_typedef.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/align_typedef.html
index 6d94eadf..6d94eadf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/align_typedef.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/align_typedef.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/ben.cfg.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/ben.cfg.txt
index 201e8a94..acc4c8f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/ben.cfg.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/ben.cfg.txt
@@ -92,7 +92,7 @@ sp_between_ptr_star		= remove
 align_with_tabs			= FALSE		# use tabs to align
 align_on_tabstop		= FALSE		# align on tabstops
 align_enum_equ_span		= 4
-align_nl_cont			= TRUE
+align_nl_cont			= 1
 align_var_def_span		= 1
 align_var_def_thresh		= 12
 align_var_def_inline		= TRUE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/config.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/config.txt
index 7c523470..9b3d568c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/config.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/config.txt
@@ -1,4 +1,4 @@
-# Uncrustify-0.76.0
+# Uncrustify-0.78.0
 
 #
 # General options
@@ -101,6 +101,12 @@ 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> ){ ... }'
+# with an empty list.
+sp_cpp_lambda_argument_list_empty = 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
 
@@ -195,9 +201,36 @@ sp_before_ptr_star              = ignore   # ignore/add/remove/force/not_defined
 # variable name. If set to ignore, sp_before_ptr_star is used instead.
 sp_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space before pointer star '*' that is followed by a qualifier.
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_qualifier_ptr_star    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*' that is followed by 'operator' keyword.
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_operator_ptr_star     = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*' that is followed by
+# a class scope (as in 'int *MyClass::method()') or namespace scope
+# (as in 'int *my_ns::func()').
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_scope_ptr_star        = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*' that is followed by '::',
+# as in 'int *::func()'.
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_global_scope_ptr_star = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between a qualifier and a pointer star '*' that isn't
+# followed by a variable name, as in '(char const *)'. If set to ignore,
+# sp_before_ptr_star is used instead.
+sp_qualifier_unnamed_ptr_star   = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space between pointer stars '*', as in 'int ***a;'.
 sp_between_ptr_star             = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space between pointer star '*' and reference '&', as in 'int *& a;'.
+sp_between_ptr_ref              = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space after pointer star '*', if followed by a word.
 #
 # Overrides sp_type_func.
@@ -232,13 +265,24 @@ sp_ptr_star_func_type           = ignore   # ignore/add/remove/force/not_defined
 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.
+# prototype or function definition. If set to ignore, sp_before_ptr_star is
+# used instead.
 sp_before_ptr_star_func         = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space between a qualifier and a pointer star '*' followed by
+# the name of the function in a function prototype or definition, as in
+# 'char const *foo()`. If set to ignore, sp_before_ptr_star is used instead.
+sp_qualifier_ptr_star_func      = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space before a pointer star '*' in the trailing return of a
 # function prototype or function definition.
 sp_before_ptr_star_trailing     = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space between a qualifier and a pointer star '*' in the
+# trailing return of a function prototype or function definition, as in
+# 'auto foo() -> char const *'.
+sp_qualifier_ptr_star_trailing  = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space before a reference sign '&'.
 sp_before_byref                 = ignore   # ignore/add/remove/force/not_defined
 
@@ -297,6 +341,7 @@ sp_before_angle                 = ignore   # ignore/add/remove/force/not_defined
 sp_inside_angle                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '<>'.
+# if empty.
 sp_inside_angle_empty           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and ':'.
@@ -433,6 +478,7 @@ sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force/not_defined
 sp_inside_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '[]'.
+# if empty.
 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
@@ -591,6 +637,7 @@ sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force/not_defined
 sp_inside_braces                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '{}'.
+# if empty.
 sp_inside_braces_empty          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around trailing return operator '->'.
@@ -608,7 +655,7 @@ sp_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
 sp_func_proto_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '()' on function declaration
-# without parameters.
+# if empty.
 sp_func_proto_paren_empty       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' with a typedef specifier.
@@ -618,7 +665,7 @@ sp_func_type_paren              = ignore   # ignore/add/remove/force/not_defined
 sp_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '()' on function definition
-# without parameters.
+# if empty.
 sp_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside empty function '()'.
@@ -628,6 +675,16 @@ 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/not_defined
 
+# Add or remove space inside user functor '(' and ')'.
+sp_func_call_user_inside_rparen = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside empty functor '()'.
+# Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
+sp_inside_rparens               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside functor '(' and ')'.
+sp_inside_rparen                = 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/not_defined
@@ -967,6 +1024,14 @@ sp_extern_paren                 = ignore   # ignore/add/remove/force/not_defined
 # 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
 
+# remove space after the '//' and the pvs command '-V1234',
+# only works with sp_cmt_cpp_start set to add or force.
+sp_cmt_cpp_pvs                  = false    # true/false
+
+# remove space after the '//' and the command 'lint',
+# only works with sp_cmt_cpp_start set to add or force.
+sp_cmt_cpp_lint                 = false    # true/false
+
 # 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
@@ -1049,6 +1114,12 @@ sp_after_noexcept               = ignore   # ignore/add/remove/force/not_defined
 # Add or remove space after '_'.
 sp_vala_after_translation       = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space before a bit colon ':'.
+sp_before_bit_colon             = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after a bit colon ':'.
+sp_after_bit_colon              = ignore   # ignore/add/remove/force/not_defined
+
 # If true, a <TAB> is inserted after #define.
 force_tab_after_define          = false    # true/false
 
@@ -2279,8 +2350,21 @@ nl_after_func_class_proto_group = 0        # unsigned number
 nl_class_leave_one_liner_groups = false    # true/false
 
 # The number of newlines after '}' of a multi-line function body.
+#
+# Overrides nl_min_after_func_body and nl_max_after_func_body.
 nl_after_func_body              = 0        # unsigned number
 
+# The minimum number of newlines after '}' of a multi-line function body.
+#
+# Only works when nl_after_func_body is 0.
+nl_min_after_func_body          = 0        # unsigned number
+
+# The maximum number of newlines after '}' of a multi-line function body.
+#
+# Only works when nl_after_func_body is 0.
+# Takes precedence over nl_min_after_func_body.
+nl_max_after_func_body          = 0        # unsigned number
+
 # The number of newlines after '}' of a multi-line function body in a class
 # declaration. Also affects class constructors/destructors.
 #
@@ -2784,6 +2868,13 @@ align_right_cmt_at_col          = 0        # unsigned number
 # 0: Don't align (default).
 align_func_proto_span           = 0        # unsigned number
 
+# Whether to ignore continuation lines when evaluating the number of
+# new lines for the function prototype alignment's span.
+#
+# false: continuation lines are part of the newlines count
+# true:  continuation lines are not counted
+align_func_proto_span_ignore_cont_lines = false    # true/false
+
 # How to consider (or treat) the '*' in the alignment of function prototypes.
 #
 # 0: Part of the type     'void *   foo();' (default)
@@ -2833,9 +2924,22 @@ align_single_line_brace_gap     = 0        # unsigned number
 # 0: Don't align (default).
 align_oc_msg_spec_span          = 0        # unsigned number
 
-# Whether to align macros wrapped with a backslash and a newline. This will
-# not work right if the macro contains a multi-line comment.
-align_nl_cont                   = false    # true/false
+# Whether and how to align backslashes that split a macro onto multiple lines.
+# This will not work right if the macro contains a multi-line comment.
+#
+# 0: Do nothing (default)
+# 1: Align the backslashes in the column at the end of the longest line
+# 2: Align with the backslash that is farthest to the left, or, if that
+#    backslash is farther left than the end of the longest line, at the end of
+#    the longest line
+# 3: Align with the backslash that is farthest to the right
+align_nl_cont                   = 0        # unsigned number
+
+# The minimum number of spaces between the end of a line and its continuation
+# backslash. Requires align_nl_cont.
+#
+# Default: 1
+align_nl_cont_spaces            = 1        # unsigned number
 
 # Whether to align macro functions and variables together.
 align_pp_define_together        = false    # true/false
@@ -3146,6 +3250,12 @@ mod_remove_extra_semicolon      = false    # true/false
 # Whether to remove duplicate include.
 mod_remove_duplicate_include    = false    # true/false
 
+# the following options (mod_XX_closebrace_comment) use different comment,
+# depending of the setting of the next option.
+# false: Use the c comment (default)
+# true : Use the cpp comment
+mod_add_force_c_closebrace_comment = false    # true/false
+
 # If a function body exceeds the specified number of newlines and doesn't have
 # a comment after the close brace, a comment will be added.
 mod_add_long_function_closebrace_comment = 0        # unsigned number
@@ -3534,6 +3644,11 @@ debug_sort_the_tracks           = true     # true/false
 # only if the -p option is set.
 debug_decode_the_flags          = false    # true/false
 
+# use (or not) the exit(EX_SOFTWARE) function.
+#
+# Default: true
+debug_use_the_exit_function_pop = true     # true/false
+
 # insert the number of the line at the beginning of each line
 set_numbering_for_html_output   = false    # true/false
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/configuration.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/configuration.txt
index f61b1176..f61b1176 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/configuration.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/configuration.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/default.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/default.cfg
index 7c523470..9b3d568c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/default.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/default.cfg
@@ -1,4 +1,4 @@
-# Uncrustify-0.76.0
+# Uncrustify-0.78.0
 
 #
 # General options
@@ -101,6 +101,12 @@ 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> ){ ... }'
+# with an empty list.
+sp_cpp_lambda_argument_list_empty = 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
 
@@ -195,9 +201,36 @@ sp_before_ptr_star              = ignore   # ignore/add/remove/force/not_defined
 # variable name. If set to ignore, sp_before_ptr_star is used instead.
 sp_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space before pointer star '*' that is followed by a qualifier.
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_qualifier_ptr_star    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*' that is followed by 'operator' keyword.
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_operator_ptr_star     = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*' that is followed by
+# a class scope (as in 'int *MyClass::method()') or namespace scope
+# (as in 'int *my_ns::func()').
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_scope_ptr_star        = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*' that is followed by '::',
+# as in 'int *::func()'.
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_global_scope_ptr_star = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between a qualifier and a pointer star '*' that isn't
+# followed by a variable name, as in '(char const *)'. If set to ignore,
+# sp_before_ptr_star is used instead.
+sp_qualifier_unnamed_ptr_star   = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space between pointer stars '*', as in 'int ***a;'.
 sp_between_ptr_star             = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space between pointer star '*' and reference '&', as in 'int *& a;'.
+sp_between_ptr_ref              = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space after pointer star '*', if followed by a word.
 #
 # Overrides sp_type_func.
@@ -232,13 +265,24 @@ sp_ptr_star_func_type           = ignore   # ignore/add/remove/force/not_defined
 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.
+# prototype or function definition. If set to ignore, sp_before_ptr_star is
+# used instead.
 sp_before_ptr_star_func         = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space between a qualifier and a pointer star '*' followed by
+# the name of the function in a function prototype or definition, as in
+# 'char const *foo()`. If set to ignore, sp_before_ptr_star is used instead.
+sp_qualifier_ptr_star_func      = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space before a pointer star '*' in the trailing return of a
 # function prototype or function definition.
 sp_before_ptr_star_trailing     = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space between a qualifier and a pointer star '*' in the
+# trailing return of a function prototype or function definition, as in
+# 'auto foo() -> char const *'.
+sp_qualifier_ptr_star_trailing  = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space before a reference sign '&'.
 sp_before_byref                 = ignore   # ignore/add/remove/force/not_defined
 
@@ -297,6 +341,7 @@ sp_before_angle                 = ignore   # ignore/add/remove/force/not_defined
 sp_inside_angle                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '<>'.
+# if empty.
 sp_inside_angle_empty           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and ':'.
@@ -433,6 +478,7 @@ sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force/not_defined
 sp_inside_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '[]'.
+# if empty.
 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
@@ -591,6 +637,7 @@ sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force/not_defined
 sp_inside_braces                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '{}'.
+# if empty.
 sp_inside_braces_empty          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around trailing return operator '->'.
@@ -608,7 +655,7 @@ sp_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
 sp_func_proto_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '()' on function declaration
-# without parameters.
+# if empty.
 sp_func_proto_paren_empty       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' with a typedef specifier.
@@ -618,7 +665,7 @@ sp_func_type_paren              = ignore   # ignore/add/remove/force/not_defined
 sp_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '()' on function definition
-# without parameters.
+# if empty.
 sp_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside empty function '()'.
@@ -628,6 +675,16 @@ 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/not_defined
 
+# Add or remove space inside user functor '(' and ')'.
+sp_func_call_user_inside_rparen = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside empty functor '()'.
+# Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
+sp_inside_rparens               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside functor '(' and ')'.
+sp_inside_rparen                = 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/not_defined
@@ -967,6 +1024,14 @@ sp_extern_paren                 = ignore   # ignore/add/remove/force/not_defined
 # 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
 
+# remove space after the '//' and the pvs command '-V1234',
+# only works with sp_cmt_cpp_start set to add or force.
+sp_cmt_cpp_pvs                  = false    # true/false
+
+# remove space after the '//' and the command 'lint',
+# only works with sp_cmt_cpp_start set to add or force.
+sp_cmt_cpp_lint                 = false    # true/false
+
 # 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
@@ -1049,6 +1114,12 @@ sp_after_noexcept               = ignore   # ignore/add/remove/force/not_defined
 # Add or remove space after '_'.
 sp_vala_after_translation       = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space before a bit colon ':'.
+sp_before_bit_colon             = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after a bit colon ':'.
+sp_after_bit_colon              = ignore   # ignore/add/remove/force/not_defined
+
 # If true, a <TAB> is inserted after #define.
 force_tab_after_define          = false    # true/false
 
@@ -2279,8 +2350,21 @@ nl_after_func_class_proto_group = 0        # unsigned number
 nl_class_leave_one_liner_groups = false    # true/false
 
 # The number of newlines after '}' of a multi-line function body.
+#
+# Overrides nl_min_after_func_body and nl_max_after_func_body.
 nl_after_func_body              = 0        # unsigned number
 
+# The minimum number of newlines after '}' of a multi-line function body.
+#
+# Only works when nl_after_func_body is 0.
+nl_min_after_func_body          = 0        # unsigned number
+
+# The maximum number of newlines after '}' of a multi-line function body.
+#
+# Only works when nl_after_func_body is 0.
+# Takes precedence over nl_min_after_func_body.
+nl_max_after_func_body          = 0        # unsigned number
+
 # The number of newlines after '}' of a multi-line function body in a class
 # declaration. Also affects class constructors/destructors.
 #
@@ -2784,6 +2868,13 @@ align_right_cmt_at_col          = 0        # unsigned number
 # 0: Don't align (default).
 align_func_proto_span           = 0        # unsigned number
 
+# Whether to ignore continuation lines when evaluating the number of
+# new lines for the function prototype alignment's span.
+#
+# false: continuation lines are part of the newlines count
+# true:  continuation lines are not counted
+align_func_proto_span_ignore_cont_lines = false    # true/false
+
 # How to consider (or treat) the '*' in the alignment of function prototypes.
 #
 # 0: Part of the type     'void *   foo();' (default)
@@ -2833,9 +2924,22 @@ align_single_line_brace_gap     = 0        # unsigned number
 # 0: Don't align (default).
 align_oc_msg_spec_span          = 0        # unsigned number
 
-# Whether to align macros wrapped with a backslash and a newline. This will
-# not work right if the macro contains a multi-line comment.
-align_nl_cont                   = false    # true/false
+# Whether and how to align backslashes that split a macro onto multiple lines.
+# This will not work right if the macro contains a multi-line comment.
+#
+# 0: Do nothing (default)
+# 1: Align the backslashes in the column at the end of the longest line
+# 2: Align with the backslash that is farthest to the left, or, if that
+#    backslash is farther left than the end of the longest line, at the end of
+#    the longest line
+# 3: Align with the backslash that is farthest to the right
+align_nl_cont                   = 0        # unsigned number
+
+# The minimum number of spaces between the end of a line and its continuation
+# backslash. Requires align_nl_cont.
+#
+# Default: 1
+align_nl_cont_spaces            = 1        # unsigned number
 
 # Whether to align macro functions and variables together.
 align_pp_define_together        = false    # true/false
@@ -3146,6 +3250,12 @@ mod_remove_extra_semicolon      = false    # true/false
 # Whether to remove duplicate include.
 mod_remove_duplicate_include    = false    # true/false
 
+# the following options (mod_XX_closebrace_comment) use different comment,
+# depending of the setting of the next option.
+# false: Use the c comment (default)
+# true : Use the cpp comment
+mod_add_force_c_closebrace_comment = false    # true/false
+
 # If a function body exceeds the specified number of newlines and doesn't have
 # a comment after the close brace, a comment will be added.
 mod_add_long_function_closebrace_comment = 0        # unsigned number
@@ -3534,6 +3644,11 @@ debug_sort_the_tracks           = true     # true/false
 # only if the -p option is set.
 debug_decode_the_flags          = false    # true/false
 
+# use (or not) the exit(EX_SOFTWARE) function.
+#
+# Default: true
+debug_use_the_exit_function_pop = true     # true/false
+
 # insert the number of the line at the beginning of each line
 set_numbering_for_html_output   = false    # true/false
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/examples/c-1.in.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/examples/c-1.in.c
index c1a53476..c1a53476 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/examples/c-1.in.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/examples/c-1.in.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/examples/c-1.out.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/examples/c-1.out.c
index ceb484c6..ceb484c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/examples/c-1.out.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/examples/c-1.out.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/examples/example.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/examples/example.c
index 7c8edf79..7c8edf79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/examples/example.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/examples/example.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/images/linuxlinks.gif b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/images/linuxlinks.gif
index d3adec5c..d3adec5c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/images/linuxlinks.gif
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/images/linuxlinks.gif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/index.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/index.html
index 01d057f7..1e832d9d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/index.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.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 - 828 configurable options as of version 0.76.0</li>
+   <li>Highly configurable - 850 configurable options as of version 0.78.0</li>
 </ul>
 
 <p>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/linux.cfg.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/linux.cfg.txt
index 7c3bc772..b2072d21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/linux.cfg.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/linux.cfg.txt
@@ -75,7 +75,7 @@ align_with_tabs		= TRUE		# use tabs to align
 align_on_tabstop	= TRUE 		# align on tabstops
 # align_keep_tabs	= true
 align_enum_equ_span	= 4		# '=' in enum definition
-# align_nl_cont		= TRUE
+# align_nl_cont		= 1
 # align_var_def_span	= 2
 # align_var_def_inline	= TRUE
 # align_var_def_star	= FALSE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options.html
index 554836c3..554836c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_ASM.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_ASM.html
index 4de0e7bb..4de0e7bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_ASM.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_ASM.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Align.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Align.html
index 474e9564..47b28230 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Align.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Align.html
@@ -3,11 +3,7 @@
 align_pp_define_gap
 The minimum space between label and value of a preprocessor define
 
-#define SetType(tt)      do { \
-      LOG_FUNC_CALL(); \
-      SetTypeReal((tt)); \
-} while (false)
-align_nl_cont                 = true
+align_nl_cont                 = 1
 
 #define LOG_STR(sev, str, len)                           \
    if (log_sev_on(sev)) { log_str(sev, str, len); }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_CLI_NET.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_CLI_NET.html
index 8838cdf0..8838cdf0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_CLI_NET.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_CLI_NET.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_C_sharp.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_C_sharp.html
index 74767b9d..74767b9d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_C_sharp.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_C_sharp.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_D.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_D.html
index 308b5c58..308b5c58 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_D.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_D.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Indenting.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Indenting.html
index 7887f759..7887f759 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Indenting.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Indenting.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Java.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Java.html
index 80083042..80083042 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Java.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Java.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_ModifyCode.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_ModifyCode.html
index e20e1098..e20e1098 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_ModifyCode.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_ModifyCode.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Namespace.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Namespace.html
index 74589df0..74589df0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Namespace.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Namespace.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_NewLines.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_NewLines.html
index e5150ed4..e5150ed4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_NewLines.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_NewLines.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Objectiv-C.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Objectiv-C.html
index 993a1b95..993a1b95 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Objectiv-C.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Objectiv-C.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Positioning.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Positioning.html
index 4e8a36cc..4e8a36cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Positioning.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Positioning.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Preprocessor.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Preprocessor.html
index 1d99b69d..1d99b69d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Preprocessor.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Preprocessor.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Assign.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_Assign.html
index 10c8b6b0..10c8b6b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Assign.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_Assign.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Byref.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_Byref.html
index 7ad47f72..7ad47f72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Byref.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_Byref.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Case.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_Case.html
index e40bfc5b..e40bfc5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Case.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_Case.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Cast.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_Cast.html
index 9e0b6e2d..9e0b6e2d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Cast.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_Cast.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Class.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_Class.html
index 1bd1c4a5..1bd1c4a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Class.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_Class.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Comma.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_Comma.html
index 3b3f0de1..3b3f0de1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Comma.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_Comma.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Enum.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_Enum.html
index f208c95f..f208c95f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Enum.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_Enum.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_For.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_For.html
index 5107f89f..5107f89f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_For.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_For.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_New.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_New.html
index 587844ae..587844ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_New.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_New.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Operator.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_Operator.html
index d73c964d..d73c964d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Operator.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_Operator.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Paren.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_Paren.html
index caa4a5a5..caa4a5a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Paren.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_Paren.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Template.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_Template.html
index d8792888..d8792888 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Space_Template.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Space_Template.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Spaces.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Spaces.html
index 35265fc6..35265fc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/options_Spaces.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/options_Spaces.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/project-support.jpg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/project-support.jpg
index 5d15550f..5d15550f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/project-support.jpg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/project-support.jpg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/uncrustify.css b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/uncrustify.css
index 240171e9..240171e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/uncrustify.css
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/uncrustify.css
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/uncrustify.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/uncrustify.html
index 0528eb63..0528eb63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/htdocs/uncrustify.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/htdocs/uncrustify.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/not_a_compiler.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/not_a_compiler.txt
index 439d4309..439d4309 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/not_a_compiler.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/not_a_compiler.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/overview.odt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/overview.odt
index e14e3285..e14e3285 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/overview.odt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/overview.odt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/paren_stack.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/paren_stack.txt
index 109709dc..5b66b471 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/paren_stack.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/paren_stack.txt
@@ -8,7 +8,7 @@
 At the heart of this algorithm are two stacks.
 There is the Paren Stack (PS) and the Frame stack.
 
-The PS (pse in the code) keeps track of braces, parens,
+The PS (m_parenStack in the code) keeps track of braces, parens,
 if/else/switch/do/while/etc items -- anything that is nestable.
 
 Complex statements go through some of these BS_ stages:
@@ -167,7 +167,7 @@ Another less-interesting example:
 *                                                                             *
 =-----------------------------------------------------------------------------=
 
-The pse stack is kept on a frame stack.
+The m_parenStack stack is kept on a frame stack.
 The frame stack is need for languages that support preprocessors (C, C++, C#)
 that can arbitrarily change code flow. It also isolates #define macros so
 that they are indented independently and do not affect the rest of the program.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/preprocessor_indentation.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/preprocessor_indentation.txt
index 7940de28..6db89502 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/preprocessor_indentation.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/preprocessor_indentation.txt
@@ -404,11 +404,11 @@ for easier reference:
 These are the warning messages related to unbalanced preprocessor blocks
 printed by Uncrustify when 'pp_warn_unbalanced_if' is true.
 
-fl_check(236): orig line is 15, unbalanced #if block braces (1), in-level is 1, out-level is 3
-fl_check(248): orig line is 17, unbalanced #if-#else block braces (1), #else out-level is 1, #if out-level is 3
-fl_check(248): orig line is 20, unbalanced #if-#else block braces (1), #else out-level is 2, #if out-level is 3
-fl_check(236): orig line is 35, unbalanced #if block braces (1), in-level is 3, out-level is 4
-fl_check(291): orig line is 37, unbalanced #if-#else block braces (2), #else out-level is 3, #if out-level is 4
-fl_check(321): orig line is 48, unbalanced #if block braces (2), in-level is 4, out-level is 2
-fl_check(321): orig line is 52, unbalanced #if block braces (2), in-level is 4, out-level is 3
+check(236): orig line is 15, unbalanced #if block braces (1), in-level is 1, out-level is 3
+check(248): orig line is 17, unbalanced #if-#else block braces (1), #else out-level is 1, #if out-level is 3
+check(248): orig line is 20, unbalanced #if-#else block braces (1), #else out-level is 2, #if out-level is 3
+check(236): orig line is 35, unbalanced #if block braces (1), in-level is 3, out-level is 4
+check(291): orig line is 37, unbalanced #if-#else block braces (2), #else out-level is 3, #if out-level is 4
+check(321): orig line is 48, unbalanced #if block braces (2), in-level is 4, out-level is 2
+check(321): orig line is 52, unbalanced #if block braces (2), in-level is 4, out-level is 3
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/theory.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/theory.txt
index 37ba9da1..37ba9da1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/theory.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/theory.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/threads.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/threads.txt
index f6ed4edd..f6ed4edd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/threads.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/threads.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/track.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/track.html
index e49e4370..e49e4370 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/documentation/track.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/documentation/track.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/CMakeLists.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/CMakeLists.txt
index 72b6efa3..72b6efa3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/CMakeLists.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/CMakeLists.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/CMake_catFiles.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/CMake_catFiles.cmake
index c637ea24..c637ea24 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/CMake_catFiles.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/CMake_catFiles.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/CMake_emscripten_test.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/CMake_emscripten_test.cmake
index a37ee945..a37ee945 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/CMake_emscripten_test.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/CMake_emscripten_test.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/README.md b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/README.md
index 22012383..22012383 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/README.md
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/README.md
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/build.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/build.sh
index df4b6fe3..df4b6fe3 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/build.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/build.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/libUncrustify.d.ts b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/libUncrustify.d.ts
index 1e7b7fb6..1e7b7fb6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/libUncrustify.d.ts
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/libUncrustify.d.ts
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/postfix_file b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/postfix_file
index 17315134..17315134 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/postfix_file
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/postfix_file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/postfix_module.js b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/postfix_module.js
index cbf8f57b..cbf8f57b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/postfix_module.js
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/postfix_module.js
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/prefix_file b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/prefix_file
index 6a6b5e98..6a6b5e98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/prefix_file
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/prefix_file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/prefix_module.js b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/prefix_module.js
index 05d09cd7..05d09cd7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/prefix_module.js
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/prefix_module.js
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/test/run_tests.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/test/run_tests.py
index c7a4fcae..c7a4fcae 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/test/run_tests.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/test/run_tests.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/test/test_run.js b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/test/test_run.js
index 27627094..27627094 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/emscripten/test/test_run.js
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/emscripten/test/test_run.js
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/MS-calling_conventions.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/MS-calling_conventions.cfg
index 36e9e14f..36e9e14f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/MS-calling_conventions.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/MS-calling_conventions.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/align_assign.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/align_assign.txt
index ecc85081..ecc85081 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/align_assign.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/align_assign.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/amxmodx.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/amxmodx.cfg
index c81a3e07..7fe5d13f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/amxmodx.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/amxmodx.cfg
@@ -105,7 +105,7 @@ sp_after_tag         = remove # pawn: space after a tag colon
 align_with_tabs       = true   # use tabs for aligning (0/1)
 align_keep_tabs       = false  # keep non-indenting tabs
 align_on_tabstop      = true   # always align on tabstops
-align_nl_cont         = false  # align the back-slash \n combo (macros)
+align_nl_cont         = 0      # align the back-slash \n combo (macros)
 align_enum_equ_span   = 1      # align the '=' in enums
 align_assign_span     = 1      # align on '='. 0=don't align
 align_assign_thresh   = 0      # threshold for aligning on '='. 0=no limit
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/ben.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/ben.cfg
index 58e7d2bd..269b3cb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/ben.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/ben.cfg
@@ -632,9 +632,16 @@ align_single_line_brace_gap               = 0        # number
 # The span for aligning ObjC msg spec (0=don't align)
 align_oc_msg_spec_span                    = 0        # number
 
-# Whether to align macros wrapped with a backslash and a newline.
+# Whether and how to align backslashes that split a macro onto multiple lines.
 # This will not work right if the macro contains a multi-line comment.
-align_nl_cont                             = true     # false/true
+#
+# 0: Do nothing (default)
+# 1: Align the backslashes in the column at the end of the longest line
+# 2: Align with the backslash that is farthest to the left, or, if that
+#    backslash is farther left than the end of the longest line, at the end of
+#    the longest line
+# 3: Align with the backslash that is farthest to the right
+align_nl_cont                             = 0        # number
 
 # # Align macro functions and variables together
 align_pp_define_together                  = false    # false/true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/ben2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/ben2.cfg
index fa27f08f..23ce1774 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/ben2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/ben2.cfg
@@ -62,7 +62,7 @@ sp_func_proto_paren		= remove	# "int foo ();" vs "int foo();"
 align_with_tabs			= FALSE		# use tabs to align
 align_on_tabstop		= FALSE		# align on tabstops
 align_enum_equ_span		= 4
-align_nl_cont			= TRUE
+align_nl_cont			= 1
 align_var_def_span		= 2
 align_var_def_inline		= TRUE
 align_var_def_star_style	= 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/d.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/d.cfg
index 7f5032d6..fd83bea9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/d.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/d.cfg
@@ -62,7 +62,7 @@ sp_func_proto_paren		= remove	# "int foo ();" vs "int foo();"
 align_with_tabs			= FALSE		# use tabs to align
 align_on_tabstop		= FALSE		# align on tabstops
 align_enum_equ_span		= 4
-align_nl_cont			= TRUE
+align_nl_cont			= 1
 align_var_def_span		= 2
 align_var_def_inline		= TRUE
 align_var_def_star_style	= 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/defaults.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/defaults.cfg
index 7c523470..9b3d568c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/defaults.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/defaults.cfg
@@ -1,4 +1,4 @@
-# Uncrustify-0.76.0
+# Uncrustify-0.78.0
 
 #
 # General options
@@ -101,6 +101,12 @@ 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> ){ ... }'
+# with an empty list.
+sp_cpp_lambda_argument_list_empty = 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
 
@@ -195,9 +201,36 @@ sp_before_ptr_star              = ignore   # ignore/add/remove/force/not_defined
 # variable name. If set to ignore, sp_before_ptr_star is used instead.
 sp_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space before pointer star '*' that is followed by a qualifier.
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_qualifier_ptr_star    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*' that is followed by 'operator' keyword.
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_operator_ptr_star     = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*' that is followed by
+# a class scope (as in 'int *MyClass::method()') or namespace scope
+# (as in 'int *my_ns::func()').
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_scope_ptr_star        = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*' that is followed by '::',
+# as in 'int *::func()'.
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_global_scope_ptr_star = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between a qualifier and a pointer star '*' that isn't
+# followed by a variable name, as in '(char const *)'. If set to ignore,
+# sp_before_ptr_star is used instead.
+sp_qualifier_unnamed_ptr_star   = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space between pointer stars '*', as in 'int ***a;'.
 sp_between_ptr_star             = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space between pointer star '*' and reference '&', as in 'int *& a;'.
+sp_between_ptr_ref              = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space after pointer star '*', if followed by a word.
 #
 # Overrides sp_type_func.
@@ -232,13 +265,24 @@ sp_ptr_star_func_type           = ignore   # ignore/add/remove/force/not_defined
 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.
+# prototype or function definition. If set to ignore, sp_before_ptr_star is
+# used instead.
 sp_before_ptr_star_func         = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space between a qualifier and a pointer star '*' followed by
+# the name of the function in a function prototype or definition, as in
+# 'char const *foo()`. If set to ignore, sp_before_ptr_star is used instead.
+sp_qualifier_ptr_star_func      = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space before a pointer star '*' in the trailing return of a
 # function prototype or function definition.
 sp_before_ptr_star_trailing     = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space between a qualifier and a pointer star '*' in the
+# trailing return of a function prototype or function definition, as in
+# 'auto foo() -> char const *'.
+sp_qualifier_ptr_star_trailing  = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space before a reference sign '&'.
 sp_before_byref                 = ignore   # ignore/add/remove/force/not_defined
 
@@ -297,6 +341,7 @@ sp_before_angle                 = ignore   # ignore/add/remove/force/not_defined
 sp_inside_angle                 = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '<>'.
+# if empty.
 sp_inside_angle_empty           = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between '>' and ':'.
@@ -433,6 +478,7 @@ sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force/not_defined
 sp_inside_square                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '[]'.
+# if empty.
 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
@@ -591,6 +637,7 @@ sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force/not_defined
 sp_inside_braces                = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside '{}'.
+# if empty.
 sp_inside_braces_empty          = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space around trailing return operator '->'.
@@ -608,7 +655,7 @@ sp_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
 sp_func_proto_paren             = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '()' on function declaration
-# without parameters.
+# if empty.
 sp_func_proto_paren_empty       = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '(' with a typedef specifier.
@@ -618,7 +665,7 @@ sp_func_type_paren              = ignore   # ignore/add/remove/force/not_defined
 sp_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between function name and '()' on function definition
-# without parameters.
+# if empty.
 sp_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space inside empty function '()'.
@@ -628,6 +675,16 @@ 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/not_defined
 
+# Add or remove space inside user functor '(' and ')'.
+sp_func_call_user_inside_rparen = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside empty functor '()'.
+# Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
+sp_inside_rparens               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside functor '(' and ')'.
+sp_inside_rparen                = 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/not_defined
@@ -967,6 +1024,14 @@ sp_extern_paren                 = ignore   # ignore/add/remove/force/not_defined
 # 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
 
+# remove space after the '//' and the pvs command '-V1234',
+# only works with sp_cmt_cpp_start set to add or force.
+sp_cmt_cpp_pvs                  = false    # true/false
+
+# remove space after the '//' and the command 'lint',
+# only works with sp_cmt_cpp_start set to add or force.
+sp_cmt_cpp_lint                 = false    # true/false
+
 # 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
@@ -1049,6 +1114,12 @@ sp_after_noexcept               = ignore   # ignore/add/remove/force/not_defined
 # Add or remove space after '_'.
 sp_vala_after_translation       = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space before a bit colon ':'.
+sp_before_bit_colon             = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after a bit colon ':'.
+sp_after_bit_colon              = ignore   # ignore/add/remove/force/not_defined
+
 # If true, a <TAB> is inserted after #define.
 force_tab_after_define          = false    # true/false
 
@@ -2279,8 +2350,21 @@ nl_after_func_class_proto_group = 0        # unsigned number
 nl_class_leave_one_liner_groups = false    # true/false
 
 # The number of newlines after '}' of a multi-line function body.
+#
+# Overrides nl_min_after_func_body and nl_max_after_func_body.
 nl_after_func_body              = 0        # unsigned number
 
+# The minimum number of newlines after '}' of a multi-line function body.
+#
+# Only works when nl_after_func_body is 0.
+nl_min_after_func_body          = 0        # unsigned number
+
+# The maximum number of newlines after '}' of a multi-line function body.
+#
+# Only works when nl_after_func_body is 0.
+# Takes precedence over nl_min_after_func_body.
+nl_max_after_func_body          = 0        # unsigned number
+
 # The number of newlines after '}' of a multi-line function body in a class
 # declaration. Also affects class constructors/destructors.
 #
@@ -2784,6 +2868,13 @@ align_right_cmt_at_col          = 0        # unsigned number
 # 0: Don't align (default).
 align_func_proto_span           = 0        # unsigned number
 
+# Whether to ignore continuation lines when evaluating the number of
+# new lines for the function prototype alignment's span.
+#
+# false: continuation lines are part of the newlines count
+# true:  continuation lines are not counted
+align_func_proto_span_ignore_cont_lines = false    # true/false
+
 # How to consider (or treat) the '*' in the alignment of function prototypes.
 #
 # 0: Part of the type     'void *   foo();' (default)
@@ -2833,9 +2924,22 @@ align_single_line_brace_gap     = 0        # unsigned number
 # 0: Don't align (default).
 align_oc_msg_spec_span          = 0        # unsigned number
 
-# Whether to align macros wrapped with a backslash and a newline. This will
-# not work right if the macro contains a multi-line comment.
-align_nl_cont                   = false    # true/false
+# Whether and how to align backslashes that split a macro onto multiple lines.
+# This will not work right if the macro contains a multi-line comment.
+#
+# 0: Do nothing (default)
+# 1: Align the backslashes in the column at the end of the longest line
+# 2: Align with the backslash that is farthest to the left, or, if that
+#    backslash is farther left than the end of the longest line, at the end of
+#    the longest line
+# 3: Align with the backslash that is farthest to the right
+align_nl_cont                   = 0        # unsigned number
+
+# The minimum number of spaces between the end of a line and its continuation
+# backslash. Requires align_nl_cont.
+#
+# Default: 1
+align_nl_cont_spaces            = 1        # unsigned number
 
 # Whether to align macro functions and variables together.
 align_pp_define_together        = false    # true/false
@@ -3146,6 +3250,12 @@ mod_remove_extra_semicolon      = false    # true/false
 # Whether to remove duplicate include.
 mod_remove_duplicate_include    = false    # true/false
 
+# the following options (mod_XX_closebrace_comment) use different comment,
+# depending of the setting of the next option.
+# false: Use the c comment (default)
+# true : Use the cpp comment
+mod_add_force_c_closebrace_comment = false    # true/false
+
 # If a function body exceeds the specified number of newlines and doesn't have
 # a comment after the close brace, a comment will be added.
 mod_add_long_function_closebrace_comment = 0        # unsigned number
@@ -3534,6 +3644,11 @@ debug_sort_the_tracks           = true     # true/false
 # only if the -p option is set.
 debug_decode_the_flags          = false    # true/false
 
+# use (or not) the exit(EX_SOFTWARE) function.
+#
+# Default: true
+debug_use_the_exit_function_pop = true     # true/false
+
 # insert the number of the line at the beginning of each line
 set_numbering_for_html_output   = false    # true/false
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/dofiles.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/dofiles.sh
index e08fd6f7..e08fd6f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/dofiles.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/dofiles.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/freebsd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/freebsd.cfg
index 6cf0a155..ac0ae4b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/freebsd.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/freebsd.cfg
@@ -212,7 +212,7 @@ align_single_line_func                   = false
 align_single_line_brace                  = false
 align_single_line_brace_gap              = 0
 align_oc_msg_spec_span                   = 0
-align_nl_cont                            = true
+align_nl_cont                            = 1
 align_pp_define_gap                      = 4
 align_pp_define_span                     = 3
 align_left_shift                         = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/gnu-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/gnu-indent.cfg
index f30ba47d..fff72aef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/gnu-indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/gnu-indent.cfg
@@ -61,7 +61,7 @@ sp_func_proto_paren		= remove	# "int foo ();" vs "int foo();"
 # align_with_tabs			= FALSE		# use tabs to align
 # align_on_tabstop		= FALSE		# align on tabstops
 # align_enum_equ_span		= 4
-# align_nl_cont			= TRUE
+# align_nl_cont			= 1
 # align_var_def_span		= 2
 # align_var_def_inline		= TRUE
 # align_var_def_star		= TRUE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/klaus.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/klaus.cfg
index 93e38ed5..22203118 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/klaus.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/klaus.cfg
@@ -291,7 +291,7 @@ align_right_cmt_span          = 3        # number
 align_func_proto_span         = 0        # number
 
 # Whether to align macros wrapped with a backslash and a newline
-align_nl_cont                 = true     # false/true
+align_nl_cont                 = 1        # number
 
 # The minimum space between label and value of a preprocessor define
 align_pp_define_gap           = 4        # number
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/kr-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/kr-indent.cfg
index d2940437..2307d4e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/kr-indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/kr-indent.cfg
@@ -61,7 +61,7 @@ sp_func_proto_paren		= remove	# "int foo ();" vs "int foo();"
 # align_with_tabs			= FALSE		# use tabs to align
 # align_on_tabstop		= FALSE		# align on tabstops
 # align_enum_equ_span		= 4
-# align_nl_cont			= TRUE
+# align_nl_cont			= 1
 # align_var_def_span		= 2
 # align_var_def_inline		= TRUE
 # align_var_def_star		= TRUE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/linux-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/linux-indent.cfg
index 3d924d45..33de446d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/linux-indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/linux-indent.cfg
@@ -73,7 +73,7 @@ sp_func_proto_paren	= remove	# "int foo ();" vs "int foo();"
 #
 
 align_enum_equ_span	= 4		# '=' in enum definition
-# align_nl_cont		= TRUE
+# align_nl_cont		= 1
 # align_var_def_span	= 2
 # align_var_def_inline	= TRUE
 # align_var_def_star	= FALSE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/linux.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/linux.cfg
index 6e10303c..12efb4f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/linux.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/linux.cfg
@@ -79,7 +79,7 @@ align_with_tabs		= TRUE		# use tabs to align
 align_on_tabstop	= TRUE 		# align on tabstops
 # align_keep_tabs		= true
 align_enum_equ_span	= 4		# '=' in enum definition
-# align_nl_cont		= TRUE
+# align_nl_cont		= 1
 # align_var_def_span	= 2
 # align_var_def_inline	= TRUE
 # align_var_def_star	= FALSE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/mono.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/mono.cfg
index 43ecdc8d..54740471 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/mono.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/mono.cfg
@@ -65,7 +65,7 @@ sp_func_proto_paren		= force		# "int foo ();" vs "int foo();"
 # align_with_tabs			= FALSE		# use tabs to align
 # align_on_tabstop		= FALSE		# align on tabstops
 # align_enum_equ_span		= 4
-# align_nl_cont			= TRUE
+# align_nl_cont			= 1
 # align_var_def_span		= 2
 # align_var_def_inline		= TRUE
 # align_var_def_star		= TRUE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/msvc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/msvc.cfg
index 36e9e14f..36e9e14f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/msvc.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/msvc.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/objc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/objc.cfg
index 265078b8..ebb303bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/objc.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/objc.cfg
@@ -108,7 +108,7 @@ align_with_tabs               = False     # use tabs to align
 align_on_tabstop              = False     # align on tabstops
 # align_keep_tabs             = True
 align_enum_equ_span           = 4         # '=' in enum definition
-# align_nl_cont               = True
+# align_nl_cont               = 1
 # align_var_def_span          = 2
 # align_var_def_inline        = True
 # align_var_def_star          = False
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/sun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/sun.cfg
index b1c16263..1d471287 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/sun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/sun.cfg
@@ -983,9 +983,16 @@ align_single_line_brace_gap               = 0        # number
 # The span for aligning ObjC msg spec (0=don't align)
 align_oc_msg_spec_span                    = 1        # number
 
-# Whether to align macros wrapped with a backslash and a newline.
+# Whether and how to align backslashes that split a macro onto multiple lines.
 # This will not work right if the macro contains a multi-line comment.
-align_nl_cont                             = false    # false/true
+#
+# 0: Do nothing (default)
+# 1: Align the backslashes in the column at the end of the longest line
+# 2: Align with the backslash that is farthest to the left, or, if that
+#    backslash is farther left than the end of the longest line, at the end of
+#    the longest line
+# 3: Align with the backslash that is farthest to the right
+align_nl_cont                             = 0        # number
 
 # # Align macro functions and variables together
 align_pp_define_together                  = true     # false/true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/types.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/types.txt
index 0df27c78..0df27c78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/types.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/types.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/uigui_uncrustify.ini b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/uigui_uncrustify.ini
index 80a27c58..86678454 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/uigui_uncrustify.ini
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/uigui_uncrustify.ini
@@ -2,7 +2,7 @@
 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|*.c++|*.cc|*.cp|*.cpp|*.cs|*.cxx|*.d|*.di|*.es|*.h|*.h++|*.hh|*.hp|*.hpp|*.hxx|*.inl|*.java|*.js|*.m|*.mm|*.p|*.pawn|*.sma|*.sqc|*.sql|*.vala
+fileTypes=*.c|*.c++|*.cc|*.cp|*.cpp|*.cs|*.cxx|*.d|*.di|*.es|*.h|*.h++|*.hh|*.hp|*.hpp|*.hxx|*.inc|*.inl|*.java|*.js|*.m|*.mm|*.p|*.pawn|*.sma|*.sqc|*.sql|*.vala|*.vapi
 indenterFileName=uncrustify
 indenterName=Uncrustify (C, C++, C#, ObjectiveC, D, Java, Pawn, VALA)
 inputFileName=indentinput
@@ -15,14 +15,15 @@ parameterOrder=ipo
 showHelpParameter=-h
 stringparaminquotes=false
 useCfgFileParameter="-c "
-version=Uncrustify-0.76.0
+useRegex=true
+version=Uncrustify-0.78.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
+Choices=newlines\s*=\s*lf|newlines\s*=\s*crlf|newlines\s*=\s*cr|newlines\s*=\s*auto
 ChoicesReadable="Newlines Unix|Newlines Win|Newlines Mac|Newlines Auto"
 ValueDefault=auto
 
@@ -31,7 +32,7 @@ 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="
+CallName="input_tab_size\s*=\s*"
 MinVal=1
 MaxVal=32
 ValueDefault=8
@@ -41,7 +42,7 @@ 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="
+CallName="output_tab_size\s*=\s*"
 MinVal=1
 MaxVal=32
 ValueDefault=8
@@ -51,7 +52,7 @@ 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="
+CallName="string_escape_char\s*=\s*"
 MinVal=0
 MaxVal=255
 ValueDefault=92
@@ -61,7 +62,7 @@ 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="
+CallName="string_escape_char2\s*=\s*"
 MinVal=0
 MaxVal=255
 ValueDefault=0
@@ -71,7 +72,7 @@ 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
+TrueFalse=string_replace_tab_chars\s*=\s*true|string_replace_tab_chars\s*=\s*false
 ValueDefault=false
 
 [Tok Split Gte]
@@ -79,7 +80,7 @@ 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
+TrueFalse=tok_split_gte\s*=\s*true|tok_split_gte\s*=\s*false
 ValueDefault=false
 
 [Disable Processing Nl Cont]
@@ -87,14 +88,14 @@ 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
+TrueFalse=disable_processing_nl_cont\s*=\s*true|disable_processing_nl_cont\s*=\s*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=
+CallName=disable_processing_cmt\s*=\s*
 EditorType=string
 ValueDefault= *INDENT-OFF*
 
@@ -102,7 +103,7 @@ ValueDefault= *INDENT-OFF*
 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=
+CallName=enable_processing_cmt\s*=\s*
 EditorType=string
 ValueDefault= *INDENT-ON*
 
@@ -111,7 +112,7 @@ Category=0
 Description="<html>Enable parsing of digraphs.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=enable_digraphs=true|enable_digraphs=false
+TrueFalse=enable_digraphs\s*=\s*true|enable_digraphs\s*=\s*false
 ValueDefault=false
 
 [Processing Cmt As Regex]
@@ -119,7 +120,7 @@ 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
+TrueFalse=processing_cmt_as_regex\s*=\s*true|processing_cmt_as_regex\s*=\s*false
 ValueDefault=false
 
 [Utf8 Bom]
@@ -127,7 +128,7 @@ 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
+Choices=utf8_bom\s*=\s*ignore|utf8_bom\s*=\s*add|utf8_bom\s*=\s*remove|utf8_bom\s*=\s*force|utf8_bom\s*=\s*not_defined
 ChoicesReadable="Ignore Utf8 Bom|Add Utf8 Bom|Remove Utf8 Bom|Force Utf8 Bom"
 ValueDefault=ignore
 
@@ -136,7 +137,7 @@ 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
+TrueFalse=utf8_byte\s*=\s*true|utf8_byte\s*=\s*false
 ValueDefault=false
 
 [Utf8 Force]
@@ -144,7 +145,7 @@ Category=0
 Description="<html>Force the output encoding to UTF-8.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=utf8_force=true|utf8_force=false
+TrueFalse=utf8_force\s*=\s*true|utf8_force\s*=\s*false
 ValueDefault=false
 
 [Sp Arith]
@@ -152,7 +153,7 @@ 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
+Choices=sp_arith\s*=\s*ignore|sp_arith\s*=\s*add|sp_arith\s*=\s*remove|sp_arith\s*=\s*force|sp_arith\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Arith|Add Sp Arith|Remove Sp Arith|Force Sp Arith"
 ValueDefault=ignore
 
@@ -161,7 +162,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|sp_arith_additive=not_defined
+Choices=sp_arith_additive\s*=\s*ignore|sp_arith_additive\s*=\s*add|sp_arith_additive\s*=\s*remove|sp_arith_additive\s*=\s*force|sp_arith_additive\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Arith Additive|Add Sp Arith Additive|Remove Sp Arith Additive|Force Sp Arith Additive"
 ValueDefault=ignore
 
@@ -170,7 +171,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|sp_assign=not_defined
+Choices=sp_assign\s*=\s*ignore|sp_assign\s*=\s*add|sp_assign\s*=\s*remove|sp_assign\s*=\s*force|sp_assign\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Assign|Add Sp Assign|Remove Sp Assign|Force Sp Assign"
 ValueDefault=ignore
 
@@ -179,7 +180,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|sp_cpp_lambda_assign=not_defined
+Choices=sp_cpp_lambda_assign\s*=\s*ignore|sp_cpp_lambda_assign\s*=\s*add|sp_cpp_lambda_assign\s*=\s*remove|sp_cpp_lambda_assign\s*=\s*force|sp_cpp_lambda_assign\s*=\s*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
 
@@ -188,7 +189,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|sp_cpp_lambda_square_paren=not_defined
+Choices=sp_cpp_lambda_square_paren\s*=\s*ignore|sp_cpp_lambda_square_paren\s*=\s*add|sp_cpp_lambda_square_paren\s*=\s*remove|sp_cpp_lambda_square_paren\s*=\s*force|sp_cpp_lambda_square_paren\s*=\s*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
 
@@ -197,16 +198,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|sp_cpp_lambda_square_brace=not_defined
+Choices=sp_cpp_lambda_square_brace\s*=\s*ignore|sp_cpp_lambda_square_brace\s*=\s*add|sp_cpp_lambda_square_brace\s*=\s*remove|sp_cpp_lambda_square_brace\s*=\s*force|sp_cpp_lambda_square_brace\s*=\s*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 Empty]
+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; ){ ... }'<br/>with an empty list.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_cpp_lambda_argument_list_empty\s*=\s*ignore|sp_cpp_lambda_argument_list_empty\s*=\s*add|sp_cpp_lambda_argument_list_empty\s*=\s*remove|sp_cpp_lambda_argument_list_empty\s*=\s*force|sp_cpp_lambda_argument_list_empty\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Cpp Lambda Argument List Empty|Add Sp Cpp Lambda Argument List Empty|Remove Sp Cpp Lambda Argument List Empty|Force Sp Cpp Lambda Argument List Empty"
+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
+Choices=sp_cpp_lambda_argument_list\s*=\s*ignore|sp_cpp_lambda_argument_list\s*=\s*add|sp_cpp_lambda_argument_list\s*=\s*remove|sp_cpp_lambda_argument_list\s*=\s*force|sp_cpp_lambda_argument_list\s*=\s*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
 
@@ -215,7 +225,7 @@ 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
+Choices=sp_cpp_lambda_paren_brace\s*=\s*ignore|sp_cpp_lambda_paren_brace\s*=\s*add|sp_cpp_lambda_paren_brace\s*=\s*remove|sp_cpp_lambda_paren_brace\s*=\s*force|sp_cpp_lambda_paren_brace\s*=\s*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
 
@@ -224,7 +234,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|sp_cpp_lambda_fparen=not_defined
+Choices=sp_cpp_lambda_fparen\s*=\s*ignore|sp_cpp_lambda_fparen\s*=\s*add|sp_cpp_lambda_fparen\s*=\s*remove|sp_cpp_lambda_fparen\s*=\s*force|sp_cpp_lambda_fparen\s*=\s*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
 
@@ -233,7 +243,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|sp_assign_default=not_defined
+Choices=sp_assign_default\s*=\s*ignore|sp_assign_default\s*=\s*add|sp_assign_default\s*=\s*remove|sp_assign_default\s*=\s*force|sp_assign_default\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Assign Default|Add Sp Assign Default|Remove Sp Assign Default|Force Sp Assign Default"
 ValueDefault=ignore
 
@@ -242,7 +252,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|sp_before_assign=not_defined
+Choices=sp_before_assign\s*=\s*ignore|sp_before_assign\s*=\s*add|sp_before_assign\s*=\s*remove|sp_before_assign\s*=\s*force|sp_before_assign\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Assign|Add Sp Before Assign|Remove Sp Before Assign|Force Sp Before Assign"
 ValueDefault=ignore
 
@@ -251,7 +261,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|sp_after_assign=not_defined
+Choices=sp_after_assign\s*=\s*ignore|sp_after_assign\s*=\s*add|sp_after_assign\s*=\s*remove|sp_after_assign\s*=\s*force|sp_after_assign\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Assign|Add Sp After Assign|Remove Sp After Assign|Force Sp After Assign"
 ValueDefault=ignore
 
@@ -260,7 +270,7 @@ Category=1
 Description="<html>Add or remove space in 'enum {'.<br/><br/>Default: add</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_enum_brace=ignore|sp_enum_brace=add|sp_enum_brace=remove|sp_enum_brace=force|sp_enum_brace=not_defined
+Choices=sp_enum_brace\s*=\s*ignore|sp_enum_brace\s*=\s*add|sp_enum_brace\s*=\s*remove|sp_enum_brace\s*=\s*force|sp_enum_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Enum Brace|Add Sp Enum Brace|Remove Sp Enum Brace|Force Sp Enum Brace"
 ValueDefault=add
 
@@ -269,7 +279,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|sp_enum_paren=not_defined
+Choices=sp_enum_paren\s*=\s*ignore|sp_enum_paren\s*=\s*add|sp_enum_paren\s*=\s*remove|sp_enum_paren\s*=\s*force|sp_enum_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Enum Paren|Add Sp Enum Paren|Remove Sp Enum Paren|Force Sp Enum Paren"
 ValueDefault=ignore
 
@@ -278,7 +288,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|sp_enum_assign=not_defined
+Choices=sp_enum_assign\s*=\s*ignore|sp_enum_assign\s*=\s*add|sp_enum_assign\s*=\s*remove|sp_enum_assign\s*=\s*force|sp_enum_assign\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Enum Assign|Add Sp Enum Assign|Remove Sp Enum Assign|Force Sp Enum Assign"
 ValueDefault=ignore
 
@@ -287,7 +297,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|sp_enum_before_assign=not_defined
+Choices=sp_enum_before_assign\s*=\s*ignore|sp_enum_before_assign\s*=\s*add|sp_enum_before_assign\s*=\s*remove|sp_enum_before_assign\s*=\s*force|sp_enum_before_assign\s*=\s*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
 
@@ -296,7 +306,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|sp_enum_after_assign=not_defined
+Choices=sp_enum_after_assign\s*=\s*ignore|sp_enum_after_assign\s*=\s*add|sp_enum_after_assign\s*=\s*remove|sp_enum_after_assign\s*=\s*force|sp_enum_after_assign\s*=\s*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
 
@@ -305,7 +315,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|sp_enum_colon=not_defined
+Choices=sp_enum_colon\s*=\s*ignore|sp_enum_colon\s*=\s*add|sp_enum_colon\s*=\s*remove|sp_enum_colon\s*=\s*force|sp_enum_colon\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Enum Colon|Add Sp Enum Colon|Remove Sp Enum Colon|Force Sp Enum Colon"
 ValueDefault=ignore
 
@@ -314,7 +324,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|sp_pp_concat=not_defined
+Choices=sp_pp_concat\s*=\s*ignore|sp_pp_concat\s*=\s*add|sp_pp_concat\s*=\s*remove|sp_pp_concat\s*=\s*force|sp_pp_concat\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Pp Concat|Add Sp Pp Concat|Remove Sp Pp Concat|Force Sp Pp Concat"
 ValueDefault=add
 
@@ -323,7 +333,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|sp_pp_stringify=not_defined
+Choices=sp_pp_stringify\s*=\s*ignore|sp_pp_stringify\s*=\s*add|sp_pp_stringify\s*=\s*remove|sp_pp_stringify\s*=\s*force|sp_pp_stringify\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Pp Stringify|Add Sp Pp Stringify|Remove Sp Pp Stringify|Force Sp Pp Stringify"
 ValueDefault=ignore
 
@@ -332,7 +342,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|sp_before_pp_stringify=not_defined
+Choices=sp_before_pp_stringify\s*=\s*ignore|sp_before_pp_stringify\s*=\s*add|sp_before_pp_stringify\s*=\s*remove|sp_before_pp_stringify\s*=\s*force|sp_before_pp_stringify\s*=\s*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
 
@@ -341,7 +351,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|sp_bool=not_defined
+Choices=sp_bool\s*=\s*ignore|sp_bool\s*=\s*add|sp_bool\s*=\s*remove|sp_bool\s*=\s*force|sp_bool\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Bool|Add Sp Bool|Remove Sp Bool|Force Sp Bool"
 ValueDefault=ignore
 
@@ -350,7 +360,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|sp_compare=not_defined
+Choices=sp_compare\s*=\s*ignore|sp_compare\s*=\s*add|sp_compare\s*=\s*remove|sp_compare\s*=\s*force|sp_compare\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Compare|Add Sp Compare|Remove Sp Compare|Force Sp Compare"
 ValueDefault=ignore
 
@@ -359,7 +369,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|sp_inside_paren=not_defined
+Choices=sp_inside_paren\s*=\s*ignore|sp_inside_paren\s*=\s*add|sp_inside_paren\s*=\s*remove|sp_inside_paren\s*=\s*force|sp_inside_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Inside Paren|Add Sp Inside Paren|Remove Sp Inside Paren|Force Sp Inside Paren"
 ValueDefault=ignore
 
@@ -368,7 +378,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|sp_paren_paren=not_defined
+Choices=sp_paren_paren\s*=\s*ignore|sp_paren_paren\s*=\s*add|sp_paren_paren\s*=\s*remove|sp_paren_paren\s*=\s*force|sp_paren_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Paren Paren|Add Sp Paren Paren|Remove Sp Paren Paren|Force Sp Paren Paren"
 ValueDefault=ignore
 
@@ -377,7 +387,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|sp_cparen_oparen=not_defined
+Choices=sp_cparen_oparen\s*=\s*ignore|sp_cparen_oparen\s*=\s*add|sp_cparen_oparen\s*=\s*remove|sp_cparen_oparen\s*=\s*force|sp_cparen_oparen\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Cparen Oparen|Add Sp Cparen Oparen|Remove Sp Cparen Oparen|Force Sp Cparen Oparen"
 ValueDefault=ignore
 
@@ -386,7 +396,7 @@ 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
+TrueFalse=sp_balance_nested_parens\s*=\s*true|sp_balance_nested_parens\s*=\s*false
 ValueDefault=false
 
 [Sp Paren Brace]
@@ -394,7 +404,7 @@ 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
+Choices=sp_paren_brace\s*=\s*ignore|sp_paren_brace\s*=\s*add|sp_paren_brace\s*=\s*remove|sp_paren_brace\s*=\s*force|sp_paren_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Paren Brace|Add Sp Paren Brace|Remove Sp Paren Brace|Force Sp Paren Brace"
 ValueDefault=ignore
 
@@ -403,7 +413,7 @@ 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
+Choices=sp_brace_brace\s*=\s*ignore|sp_brace_brace\s*=\s*add|sp_brace_brace\s*=\s*remove|sp_brace_brace\s*=\s*force|sp_brace_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Brace Brace|Add Sp Brace Brace|Remove Sp Brace Brace|Force Sp Brace Brace"
 ValueDefault=ignore
 
@@ -412,7 +422,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|sp_before_ptr_star=not_defined
+Choices=sp_before_ptr_star\s*=\s*ignore|sp_before_ptr_star\s*=\s*add|sp_before_ptr_star\s*=\s*remove|sp_before_ptr_star\s*=\s*force|sp_before_ptr_star\s*=\s*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
 
@@ -421,25 +431,79 @@ 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
+Choices=sp_before_unnamed_ptr_star\s*=\s*ignore|sp_before_unnamed_ptr_star\s*=\s*add|sp_before_unnamed_ptr_star\s*=\s*remove|sp_before_unnamed_ptr_star\s*=\s*force|sp_before_unnamed_ptr_star\s*=\s*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 Before Qualifier Ptr Star]
+Category=1
+Description="<html>Add or remove space before pointer star '*' that is followed by a qualifier.<br/>If set to ignore, sp_before_unnamed_ptr_star is used instead.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_before_qualifier_ptr_star\s*=\s*ignore|sp_before_qualifier_ptr_star\s*=\s*add|sp_before_qualifier_ptr_star\s*=\s*remove|sp_before_qualifier_ptr_star\s*=\s*force|sp_before_qualifier_ptr_star\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Before Qualifier Ptr Star|Add Sp Before Qualifier Ptr Star|Remove Sp Before Qualifier Ptr Star|Force Sp Before Qualifier Ptr Star"
+ValueDefault=ignore
+
+[Sp Before Operator Ptr Star]
+Category=1
+Description="<html>Add or remove space before pointer star '*' that is followed by 'operator' keyword.<br/>If set to ignore, sp_before_unnamed_ptr_star is used instead.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_before_operator_ptr_star\s*=\s*ignore|sp_before_operator_ptr_star\s*=\s*add|sp_before_operator_ptr_star\s*=\s*remove|sp_before_operator_ptr_star\s*=\s*force|sp_before_operator_ptr_star\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Before Operator Ptr Star|Add Sp Before Operator Ptr Star|Remove Sp Before Operator Ptr Star|Force Sp Before Operator Ptr Star"
+ValueDefault=ignore
+
+[Sp Before Scope Ptr Star]
+Category=1
+Description="<html>Add or remove space before pointer star '*' that is followed by<br/>a class scope (as in 'int *MyClass::method()') or namespace scope<br/>(as in 'int *my_ns::func()').<br/>If set to ignore, sp_before_unnamed_ptr_star is used instead.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_before_scope_ptr_star\s*=\s*ignore|sp_before_scope_ptr_star\s*=\s*add|sp_before_scope_ptr_star\s*=\s*remove|sp_before_scope_ptr_star\s*=\s*force|sp_before_scope_ptr_star\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Before Scope Ptr Star|Add Sp Before Scope Ptr Star|Remove Sp Before Scope Ptr Star|Force Sp Before Scope Ptr Star"
+ValueDefault=ignore
+
+[Sp Before Global Scope Ptr Star]
+Category=1
+Description="<html>Add or remove space before pointer star '*' that is followed by '::',<br/>as in 'int *::func()'.<br/>If set to ignore, sp_before_unnamed_ptr_star is used instead.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_before_global_scope_ptr_star\s*=\s*ignore|sp_before_global_scope_ptr_star\s*=\s*add|sp_before_global_scope_ptr_star\s*=\s*remove|sp_before_global_scope_ptr_star\s*=\s*force|sp_before_global_scope_ptr_star\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Before Global Scope Ptr Star|Add Sp Before Global Scope Ptr Star|Remove Sp Before Global Scope Ptr Star|Force Sp Before Global Scope Ptr Star"
+ValueDefault=ignore
+
+[Sp Qualifier Unnamed Ptr Star]
+Category=1
+Description="<html>Add or remove space between a qualifier and a pointer star '*' that isn't<br/>followed by a variable name, as in '(char const *)'. If set to ignore,<br/>sp_before_ptr_star is used instead.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_qualifier_unnamed_ptr_star\s*=\s*ignore|sp_qualifier_unnamed_ptr_star\s*=\s*add|sp_qualifier_unnamed_ptr_star\s*=\s*remove|sp_qualifier_unnamed_ptr_star\s*=\s*force|sp_qualifier_unnamed_ptr_star\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Qualifier Unnamed Ptr Star|Add Sp Qualifier Unnamed Ptr Star|Remove Sp Qualifier Unnamed Ptr Star|Force Sp Qualifier Unnamed Ptr Star"
+ValueDefault=ignore
+
 [Sp Between Ptr Star]
 Category=1
 Description="<html>Add or remove space between pointer stars '*', as in 'int ***a;'.</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
+Choices=sp_between_ptr_star\s*=\s*ignore|sp_between_ptr_star\s*=\s*add|sp_between_ptr_star\s*=\s*remove|sp_between_ptr_star\s*=\s*force|sp_between_ptr_star\s*=\s*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 Between Ptr Ref]
+Category=1
+Description="<html>Add or remove space between pointer star '*' and reference '&amp;', as in 'int *&amp; a;'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_between_ptr_ref\s*=\s*ignore|sp_between_ptr_ref\s*=\s*add|sp_between_ptr_ref\s*=\s*remove|sp_between_ptr_ref\s*=\s*force|sp_between_ptr_ref\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Between Ptr Ref|Add Sp Between Ptr Ref|Remove Sp Between Ptr Ref|Force Sp Between Ptr Ref"
+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
+Choices=sp_after_ptr_star\s*=\s*ignore|sp_after_ptr_star\s*=\s*add|sp_after_ptr_star\s*=\s*remove|sp_after_ptr_star\s*=\s*force|sp_after_ptr_star\s*=\s*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
 
@@ -448,7 +512,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|sp_after_ptr_block_caret=not_defined
+Choices=sp_after_ptr_block_caret\s*=\s*ignore|sp_after_ptr_block_caret\s*=\s*add|sp_after_ptr_block_caret\s*=\s*remove|sp_after_ptr_block_caret\s*=\s*force|sp_after_ptr_block_caret\s*=\s*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
 
@@ -457,7 +521,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|sp_after_ptr_star_qualifier=not_defined
+Choices=sp_after_ptr_star_qualifier\s*=\s*ignore|sp_after_ptr_star_qualifier\s*=\s*add|sp_after_ptr_star_qualifier\s*=\s*remove|sp_after_ptr_star_qualifier\s*=\s*force|sp_after_ptr_star_qualifier\s*=\s*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
 
@@ -466,7 +530,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|sp_after_ptr_star_func=not_defined
+Choices=sp_after_ptr_star_func\s*=\s*ignore|sp_after_ptr_star_func\s*=\s*add|sp_after_ptr_star_func\s*=\s*remove|sp_after_ptr_star_func\s*=\s*force|sp_after_ptr_star_func\s*=\s*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
 
@@ -475,7 +539,7 @@ Category=1
 Description="<html>Add or remove space after a pointer star '*' in the trailing return of a<br/>function prototype or function definition.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_ptr_star_trailing=ignore|sp_after_ptr_star_trailing=add|sp_after_ptr_star_trailing=remove|sp_after_ptr_star_trailing=force|sp_after_ptr_star_trailing=not_defined
+Choices=sp_after_ptr_star_trailing\s*=\s*ignore|sp_after_ptr_star_trailing\s*=\s*add|sp_after_ptr_star_trailing\s*=\s*remove|sp_after_ptr_star_trailing\s*=\s*force|sp_after_ptr_star_trailing\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Ptr Star Trailing|Add Sp After Ptr Star Trailing|Remove Sp After Ptr Star Trailing|Force Sp After Ptr Star Trailing"
 ValueDefault=ignore
 
@@ -484,7 +548,7 @@ Category=1
 Description="<html>Add or remove space between the pointer star '*' and the name of the variable<br/>in a function pointer definition.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_ptr_star_func_var=ignore|sp_ptr_star_func_var=add|sp_ptr_star_func_var=remove|sp_ptr_star_func_var=force|sp_ptr_star_func_var=not_defined
+Choices=sp_ptr_star_func_var\s*=\s*ignore|sp_ptr_star_func_var\s*=\s*add|sp_ptr_star_func_var\s*=\s*remove|sp_ptr_star_func_var\s*=\s*force|sp_ptr_star_func_var\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Ptr Star Func Var|Add Sp Ptr Star Func Var|Remove Sp Ptr Star Func Var|Force Sp Ptr Star Func Var"
 ValueDefault=ignore
 
@@ -493,7 +557,7 @@ Category=1
 Description="<html>Add or remove space between the pointer star '*' and the name of the type<br/>in a function pointer type definition.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_ptr_star_func_type=ignore|sp_ptr_star_func_type=add|sp_ptr_star_func_type=remove|sp_ptr_star_func_type=force|sp_ptr_star_func_type=not_defined
+Choices=sp_ptr_star_func_type\s*=\s*ignore|sp_ptr_star_func_type\s*=\s*add|sp_ptr_star_func_type\s*=\s*remove|sp_ptr_star_func_type\s*=\s*force|sp_ptr_star_func_type\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Ptr Star Func Type|Add Sp Ptr Star Func Type|Remove Sp Ptr Star Func Type|Force Sp Ptr Star Func Type"
 ValueDefault=ignore
 
@@ -502,34 +566,52 @@ 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
+Choices=sp_ptr_star_paren\s*=\s*ignore|sp_ptr_star_paren\s*=\s*add|sp_ptr_star_paren\s*=\s*remove|sp_ptr_star_paren\s*=\s*force|sp_ptr_star_paren\s*=\s*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>"
+Description="<html>Add or remove space before a pointer star '*', if followed by a function<br/>prototype or function definition. If set to ignore, sp_before_ptr_star is<br/>used instead.</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
+Choices=sp_before_ptr_star_func\s*=\s*ignore|sp_before_ptr_star_func\s*=\s*add|sp_before_ptr_star_func\s*=\s*remove|sp_before_ptr_star_func\s*=\s*force|sp_before_ptr_star_func\s*=\s*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 Qualifier Ptr Star Func]
+Category=1
+Description="<html>Add or remove space between a qualifier and a pointer star '*' followed by<br/>the name of the function in a function prototype or definition, as in<br/>'char const *foo()`. If set to ignore, sp_before_ptr_star is used instead.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_qualifier_ptr_star_func\s*=\s*ignore|sp_qualifier_ptr_star_func\s*=\s*add|sp_qualifier_ptr_star_func\s*=\s*remove|sp_qualifier_ptr_star_func\s*=\s*force|sp_qualifier_ptr_star_func\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Qualifier Ptr Star Func|Add Sp Qualifier Ptr Star Func|Remove Sp Qualifier Ptr Star Func|Force Sp Qualifier Ptr Star Func"
+ValueDefault=ignore
+
 [Sp Before Ptr Star Trailing]
 Category=1
 Description="<html>Add or remove space before a pointer star '*' in the trailing return of a<br/>function prototype or function definition.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_ptr_star_trailing=ignore|sp_before_ptr_star_trailing=add|sp_before_ptr_star_trailing=remove|sp_before_ptr_star_trailing=force|sp_before_ptr_star_trailing=not_defined
+Choices=sp_before_ptr_star_trailing\s*=\s*ignore|sp_before_ptr_star_trailing\s*=\s*add|sp_before_ptr_star_trailing\s*=\s*remove|sp_before_ptr_star_trailing\s*=\s*force|sp_before_ptr_star_trailing\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Ptr Star Trailing|Add Sp Before Ptr Star Trailing|Remove Sp Before Ptr Star Trailing|Force Sp Before Ptr Star Trailing"
 ValueDefault=ignore
 
+[Sp Qualifier Ptr Star Trailing]
+Category=1
+Description="<html>Add or remove space between a qualifier and a pointer star '*' in the<br/>trailing return of a function prototype or function definition, as in<br/>'auto foo() -&gt; char const *'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_qualifier_ptr_star_trailing\s*=\s*ignore|sp_qualifier_ptr_star_trailing\s*=\s*add|sp_qualifier_ptr_star_trailing\s*=\s*remove|sp_qualifier_ptr_star_trailing\s*=\s*force|sp_qualifier_ptr_star_trailing\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Qualifier Ptr Star Trailing|Add Sp Qualifier Ptr Star Trailing|Remove Sp Qualifier Ptr Star Trailing|Force Sp Qualifier Ptr Star Trailing"
+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
+Choices=sp_before_byref\s*=\s*ignore|sp_before_byref\s*=\s*add|sp_before_byref\s*=\s*remove|sp_before_byref\s*=\s*force|sp_before_byref\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Byref|Add Sp Before Byref|Remove Sp Before Byref|Force Sp Before Byref"
 ValueDefault=ignore
 
@@ -538,7 +620,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|sp_before_unnamed_byref=not_defined
+Choices=sp_before_unnamed_byref\s*=\s*ignore|sp_before_unnamed_byref\s*=\s*add|sp_before_unnamed_byref\s*=\s*remove|sp_before_unnamed_byref\s*=\s*force|sp_before_unnamed_byref\s*=\s*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
 
@@ -547,7 +629,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|sp_after_byref=not_defined
+Choices=sp_after_byref\s*=\s*ignore|sp_after_byref\s*=\s*add|sp_after_byref\s*=\s*remove|sp_after_byref\s*=\s*force|sp_after_byref\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Byref|Add Sp After Byref|Remove Sp After Byref|Force Sp After Byref"
 ValueDefault=ignore
 
@@ -556,7 +638,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|sp_after_byref_func=not_defined
+Choices=sp_after_byref_func\s*=\s*ignore|sp_after_byref_func\s*=\s*add|sp_after_byref_func\s*=\s*remove|sp_after_byref_func\s*=\s*force|sp_after_byref_func\s*=\s*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
 
@@ -565,7 +647,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|sp_before_byref_func=not_defined
+Choices=sp_before_byref_func\s*=\s*ignore|sp_before_byref_func\s*=\s*add|sp_before_byref_func\s*=\s*remove|sp_before_byref_func\s*=\s*force|sp_before_byref_func\s*=\s*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
 
@@ -574,7 +656,7 @@ Category=1
 Description="<html>Add or remove space after a reference sign '&amp;', if followed by an open<br/>parenthesis, as in 'char&amp; (*)()'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_byref_paren=ignore|sp_byref_paren=add|sp_byref_paren=remove|sp_byref_paren=force|sp_byref_paren=not_defined
+Choices=sp_byref_paren\s*=\s*ignore|sp_byref_paren\s*=\s*add|sp_byref_paren\s*=\s*remove|sp_byref_paren\s*=\s*force|sp_byref_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Byref Paren|Add Sp Byref Paren|Remove Sp Byref Paren|Force Sp Byref Paren"
 ValueDefault=ignore
 
@@ -583,7 +665,7 @@ 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
+Choices=sp_after_type\s*=\s*ignore|sp_after_type\s*=\s*add|sp_after_type\s*=\s*remove|sp_after_type\s*=\s*force|sp_after_type\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Type|Add Sp After Type|Remove Sp After Type|Force Sp After Type"
 ValueDefault=force
 
@@ -592,7 +674,7 @@ 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
+Choices=sp_after_decltype\s*=\s*ignore|sp_after_decltype\s*=\s*add|sp_after_decltype\s*=\s*remove|sp_after_decltype\s*=\s*force|sp_after_decltype\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Decltype|Add Sp After Decltype|Remove Sp After Decltype|Force Sp After Decltype"
 ValueDefault=ignore
 
@@ -601,7 +683,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|sp_before_template_paren=not_defined
+Choices=sp_before_template_paren\s*=\s*ignore|sp_before_template_paren\s*=\s*add|sp_before_template_paren\s*=\s*remove|sp_before_template_paren\s*=\s*force|sp_before_template_paren\s*=\s*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
 
@@ -610,7 +692,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|sp_template_angle=not_defined
+Choices=sp_template_angle\s*=\s*ignore|sp_template_angle\s*=\s*add|sp_template_angle\s*=\s*remove|sp_template_angle\s*=\s*force|sp_template_angle\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Template Angle|Add Sp Template Angle|Remove Sp Template Angle|Force Sp Template Angle"
 ValueDefault=ignore
 
@@ -619,7 +701,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|sp_before_angle=not_defined
+Choices=sp_before_angle\s*=\s*ignore|sp_before_angle\s*=\s*add|sp_before_angle\s*=\s*remove|sp_before_angle\s*=\s*force|sp_before_angle\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Angle|Add Sp Before Angle|Remove Sp Before Angle|Force Sp Before Angle"
 ValueDefault=ignore
 
@@ -628,16 +710,16 @@ 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
+Choices=sp_inside_angle\s*=\s*ignore|sp_inside_angle\s*=\s*add|sp_inside_angle\s*=\s*remove|sp_inside_angle\s*=\s*force|sp_inside_angle\s*=\s*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>"
+Description="<html>Add or remove space inside '&lt;&gt;'.<br/>if empty.</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
+Choices=sp_inside_angle_empty\s*=\s*ignore|sp_inside_angle_empty\s*=\s*add|sp_inside_angle_empty\s*=\s*remove|sp_inside_angle_empty\s*=\s*force|sp_inside_angle_empty\s*=\s*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
 
@@ -646,7 +728,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|sp_angle_colon=not_defined
+Choices=sp_angle_colon\s*=\s*ignore|sp_angle_colon\s*=\s*add|sp_angle_colon\s*=\s*remove|sp_angle_colon\s*=\s*force|sp_angle_colon\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Angle Colon|Add Sp Angle Colon|Remove Sp Angle Colon|Force Sp Angle Colon"
 ValueDefault=ignore
 
@@ -655,7 +737,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|sp_after_angle=not_defined
+Choices=sp_after_angle\s*=\s*ignore|sp_after_angle\s*=\s*add|sp_after_angle\s*=\s*remove|sp_after_angle\s*=\s*force|sp_after_angle\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Angle|Add Sp After Angle|Remove Sp After Angle|Force Sp After Angle"
 ValueDefault=ignore
 
@@ -664,7 +746,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|sp_angle_paren=not_defined
+Choices=sp_angle_paren\s*=\s*ignore|sp_angle_paren\s*=\s*add|sp_angle_paren\s*=\s*remove|sp_angle_paren\s*=\s*force|sp_angle_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Angle Paren|Add Sp Angle Paren|Remove Sp Angle Paren|Force Sp Angle Paren"
 ValueDefault=ignore
 
@@ -673,7 +755,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|sp_angle_paren_empty=not_defined
+Choices=sp_angle_paren_empty\s*=\s*ignore|sp_angle_paren_empty\s*=\s*add|sp_angle_paren_empty\s*=\s*remove|sp_angle_paren_empty\s*=\s*force|sp_angle_paren_empty\s*=\s*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
 
@@ -682,7 +764,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|sp_angle_word=not_defined
+Choices=sp_angle_word\s*=\s*ignore|sp_angle_word\s*=\s*add|sp_angle_word\s*=\s*remove|sp_angle_word\s*=\s*force|sp_angle_word\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Angle Word|Add Sp Angle Word|Remove Sp Angle Word|Force Sp Angle Word"
 ValueDefault=ignore
 
@@ -691,7 +773,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|sp_angle_shift=not_defined
+Choices=sp_angle_shift\s*=\s*ignore|sp_angle_shift\s*=\s*add|sp_angle_shift\s*=\s*remove|sp_angle_shift\s*=\s*force|sp_angle_shift\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Angle Shift|Add Sp Angle Shift|Remove Sp Angle Shift|Force Sp Angle Shift"
 ValueDefault=add
 
@@ -700,7 +782,7 @@ 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
+TrueFalse=sp_permit_cpp11_shift\s*=\s*true|sp_permit_cpp11_shift\s*=\s*false
 ValueDefault=false
 
 [Sp Before Sparen]
@@ -708,7 +790,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|sp_before_sparen=not_defined
+Choices=sp_before_sparen\s*=\s*ignore|sp_before_sparen\s*=\s*add|sp_before_sparen\s*=\s*remove|sp_before_sparen\s*=\s*force|sp_before_sparen\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Sparen|Add Sp Before Sparen|Remove Sp Before Sparen|Force Sp Before Sparen"
 ValueDefault=ignore
 
@@ -717,7 +799,7 @@ Category=1
 Description="<html>Add or remove space inside '(' and ')' of control statements other than<br/>'for'.</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
+Choices=sp_inside_sparen\s*=\s*ignore|sp_inside_sparen\s*=\s*add|sp_inside_sparen\s*=\s*remove|sp_inside_sparen\s*=\s*force|sp_inside_sparen\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Inside Sparen|Add Sp Inside Sparen|Remove Sp Inside Sparen|Force Sp Inside Sparen"
 ValueDefault=ignore
 
@@ -726,7 +808,7 @@ Category=1
 Description="<html>Add or remove space after '(' of control statements other than 'for'.<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
+Choices=sp_inside_sparen_open\s*=\s*ignore|sp_inside_sparen_open\s*=\s*add|sp_inside_sparen_open\s*=\s*remove|sp_inside_sparen_open\s*=\s*force|sp_inside_sparen_open\s*=\s*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
 
@@ -735,7 +817,7 @@ Category=1
 Description="<html>Add or remove space before ')' of control statements other than 'for'.<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
+Choices=sp_inside_sparen_close\s*=\s*ignore|sp_inside_sparen_close\s*=\s*add|sp_inside_sparen_close\s*=\s*remove|sp_inside_sparen_close\s*=\s*force|sp_inside_sparen_close\s*=\s*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
 
@@ -744,7 +826,7 @@ Category=1
 Description="<html>Add or remove space inside '(' and ')' of 'for' statements.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_inside_for=ignore|sp_inside_for=add|sp_inside_for=remove|sp_inside_for=force|sp_inside_for=not_defined
+Choices=sp_inside_for\s*=\s*ignore|sp_inside_for\s*=\s*add|sp_inside_for\s*=\s*remove|sp_inside_for\s*=\s*force|sp_inside_for\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Inside For|Add Sp Inside For|Remove Sp Inside For|Force Sp Inside For"
 ValueDefault=ignore
 
@@ -753,7 +835,7 @@ Category=1
 Description="<html>Add or remove space after '(' of 'for' statements.<br/><br/>Overrides sp_inside_for.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_inside_for_open=ignore|sp_inside_for_open=add|sp_inside_for_open=remove|sp_inside_for_open=force|sp_inside_for_open=not_defined
+Choices=sp_inside_for_open\s*=\s*ignore|sp_inside_for_open\s*=\s*add|sp_inside_for_open\s*=\s*remove|sp_inside_for_open\s*=\s*force|sp_inside_for_open\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Inside For Open|Add Sp Inside For Open|Remove Sp Inside For Open|Force Sp Inside For Open"
 ValueDefault=ignore
 
@@ -762,7 +844,7 @@ Category=1
 Description="<html>Add or remove space before ')' of 'for' statements.<br/><br/>Overrides sp_inside_for.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_inside_for_close=ignore|sp_inside_for_close=add|sp_inside_for_close=remove|sp_inside_for_close=force|sp_inside_for_close=not_defined
+Choices=sp_inside_for_close\s*=\s*ignore|sp_inside_for_close\s*=\s*add|sp_inside_for_close\s*=\s*remove|sp_inside_for_close\s*=\s*force|sp_inside_for_close\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Inside For Close|Add Sp Inside For Close|Remove Sp Inside For Close|Force Sp Inside For Close"
 ValueDefault=ignore
 
@@ -771,7 +853,7 @@ Category=1
 Description="<html>Add or remove space between '((' or '))' of control statements.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_sparen_paren=ignore|sp_sparen_paren=add|sp_sparen_paren=remove|sp_sparen_paren=force|sp_sparen_paren=not_defined
+Choices=sp_sparen_paren\s*=\s*ignore|sp_sparen_paren\s*=\s*add|sp_sparen_paren\s*=\s*remove|sp_sparen_paren\s*=\s*force|sp_sparen_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Sparen Paren|Add Sp Sparen Paren|Remove Sp Sparen Paren|Force Sp Sparen Paren"
 ValueDefault=ignore
 
@@ -780,7 +862,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|sp_after_sparen=not_defined
+Choices=sp_after_sparen\s*=\s*ignore|sp_after_sparen\s*=\s*add|sp_after_sparen\s*=\s*remove|sp_after_sparen\s*=\s*force|sp_after_sparen\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Sparen|Add Sp After Sparen|Remove Sp After Sparen|Force Sp After Sparen"
 ValueDefault=ignore
 
@@ -789,7 +871,7 @@ Category=1
 Description="<html>Add or remove space between ')' and '{' 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
+Choices=sp_sparen_brace\s*=\s*ignore|sp_sparen_brace\s*=\s*add|sp_sparen_brace\s*=\s*remove|sp_sparen_brace\s*=\s*force|sp_sparen_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Sparen Brace|Add Sp Sparen Brace|Remove Sp Sparen Brace|Force Sp Sparen Brace"
 ValueDefault=ignore
 
@@ -798,7 +880,7 @@ 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
+Choices=sp_do_brace_open\s*=\s*ignore|sp_do_brace_open\s*=\s*add|sp_do_brace_open\s*=\s*remove|sp_do_brace_open\s*=\s*force|sp_do_brace_open\s*=\s*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
 
@@ -807,7 +889,7 @@ 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
+Choices=sp_brace_close_while\s*=\s*ignore|sp_brace_close_while\s*=\s*add|sp_brace_close_while\s*=\s*remove|sp_brace_close_while\s*=\s*force|sp_brace_close_while\s*=\s*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
 
@@ -816,7 +898,7 @@ 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
+Choices=sp_while_paren_open\s*=\s*ignore|sp_while_paren_open\s*=\s*add|sp_while_paren_open\s*=\s*remove|sp_while_paren_open\s*=\s*force|sp_while_paren_open\s*=\s*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
 
@@ -825,7 +907,7 @@ 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
+Choices=sp_invariant_paren\s*=\s*ignore|sp_invariant_paren\s*=\s*add|sp_invariant_paren\s*=\s*remove|sp_invariant_paren\s*=\s*force|sp_invariant_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Invariant Paren|Add Sp Invariant Paren|Remove Sp Invariant Paren|Force Sp Invariant Paren"
 ValueDefault=ignore
 
@@ -834,7 +916,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|sp_after_invariant_paren=not_defined
+Choices=sp_after_invariant_paren\s*=\s*ignore|sp_after_invariant_paren\s*=\s*add|sp_after_invariant_paren\s*=\s*remove|sp_after_invariant_paren\s*=\s*force|sp_after_invariant_paren\s*=\s*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
 
@@ -843,7 +925,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|sp_special_semi=not_defined
+Choices=sp_special_semi\s*=\s*ignore|sp_special_semi\s*=\s*add|sp_special_semi\s*=\s*remove|sp_special_semi\s*=\s*force|sp_special_semi\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Special Semi|Add Sp Special Semi|Remove Sp Special Semi|Force Sp Special Semi"
 ValueDefault=ignore
 
@@ -852,7 +934,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|sp_before_semi=not_defined
+Choices=sp_before_semi\s*=\s*ignore|sp_before_semi\s*=\s*add|sp_before_semi\s*=\s*remove|sp_before_semi\s*=\s*force|sp_before_semi\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Semi|Add Sp Before Semi|Remove Sp Before Semi|Force Sp Before Semi"
 ValueDefault=remove
 
@@ -861,7 +943,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|sp_before_semi_for=not_defined
+Choices=sp_before_semi_for\s*=\s*ignore|sp_before_semi_for\s*=\s*add|sp_before_semi_for\s*=\s*remove|sp_before_semi_for\s*=\s*force|sp_before_semi_for\s*=\s*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
 
@@ -870,7 +952,7 @@ Category=1
 Description="<html>Add or remove space before a semicolon of an empty left part of a for<br/>statement, as in 'for ( &lt;here&gt; ; ; )'.</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
+Choices=sp_before_semi_for_empty\s*=\s*ignore|sp_before_semi_for_empty\s*=\s*add|sp_before_semi_for_empty\s*=\s*remove|sp_before_semi_for_empty\s*=\s*force|sp_before_semi_for_empty\s*=\s*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
 
@@ -879,7 +961,7 @@ Category=1
 Description="<html>Add or remove space between the semicolons of an empty middle part of a for<br/>statement, as in 'for ( ; &lt;here&gt; ; )'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_between_semi_for_empty=ignore|sp_between_semi_for_empty=add|sp_between_semi_for_empty=remove|sp_between_semi_for_empty=force|sp_between_semi_for_empty=not_defined
+Choices=sp_between_semi_for_empty\s*=\s*ignore|sp_between_semi_for_empty\s*=\s*add|sp_between_semi_for_empty\s*=\s*remove|sp_between_semi_for_empty\s*=\s*force|sp_between_semi_for_empty\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Between Semi For Empty|Add Sp Between Semi For Empty|Remove Sp Between Semi For Empty|Force Sp Between Semi For Empty"
 ValueDefault=ignore
 
@@ -888,7 +970,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|sp_after_semi=not_defined
+Choices=sp_after_semi\s*=\s*ignore|sp_after_semi\s*=\s*add|sp_after_semi\s*=\s*remove|sp_after_semi\s*=\s*force|sp_after_semi\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Semi|Add Sp After Semi|Remove Sp After Semi|Force Sp After Semi"
 ValueDefault=add
 
@@ -897,7 +979,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|sp_after_semi_for=not_defined
+Choices=sp_after_semi_for\s*=\s*ignore|sp_after_semi_for\s*=\s*add|sp_after_semi_for\s*=\s*remove|sp_after_semi_for\s*=\s*force|sp_after_semi_for\s*=\s*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
 
@@ -906,7 +988,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|sp_after_semi_for_empty=not_defined
+Choices=sp_after_semi_for_empty\s*=\s*ignore|sp_after_semi_for_empty\s*=\s*add|sp_after_semi_for_empty\s*=\s*remove|sp_after_semi_for_empty\s*=\s*force|sp_after_semi_for_empty\s*=\s*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
 
@@ -915,7 +997,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|sp_before_square=not_defined
+Choices=sp_before_square\s*=\s*ignore|sp_before_square\s*=\s*add|sp_before_square\s*=\s*remove|sp_before_square\s*=\s*force|sp_before_square\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Square|Add Sp Before Square|Remove Sp Before Square|Force Sp Before Square"
 ValueDefault=ignore
 
@@ -924,7 +1006,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|sp_before_vardef_square=not_defined
+Choices=sp_before_vardef_square\s*=\s*ignore|sp_before_vardef_square\s*=\s*add|sp_before_vardef_square\s*=\s*remove|sp_before_vardef_square\s*=\s*force|sp_before_vardef_square\s*=\s*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
 
@@ -933,7 +1015,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|sp_before_square_asm_block=not_defined
+Choices=sp_before_square_asm_block\s*=\s*ignore|sp_before_square_asm_block\s*=\s*add|sp_before_square_asm_block\s*=\s*remove|sp_before_square_asm_block\s*=\s*force|sp_before_square_asm_block\s*=\s*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
 
@@ -942,7 +1024,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|sp_before_squares=not_defined
+Choices=sp_before_squares\s*=\s*ignore|sp_before_squares\s*=\s*add|sp_before_squares\s*=\s*remove|sp_before_squares\s*=\s*force|sp_before_squares\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Squares|Add Sp Before Squares|Remove Sp Before Squares|Force Sp Before Squares"
 ValueDefault=ignore
 
@@ -951,7 +1033,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|sp_cpp_before_struct_binding=not_defined
+Choices=sp_cpp_before_struct_binding\s*=\s*ignore|sp_cpp_before_struct_binding\s*=\s*add|sp_cpp_before_struct_binding\s*=\s*remove|sp_cpp_before_struct_binding\s*=\s*force|sp_cpp_before_struct_binding\s*=\s*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
 
@@ -960,16 +1042,16 @@ 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
+Choices=sp_inside_square\s*=\s*ignore|sp_inside_square\s*=\s*add|sp_inside_square\s*=\s*remove|sp_inside_square\s*=\s*force|sp_inside_square\s*=\s*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>"
+Description="<html>Add or remove space inside '[]'.<br/>if empty.</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
+Choices=sp_inside_square_empty\s*=\s*ignore|sp_inside_square_empty\s*=\s*add|sp_inside_square_empty\s*=\s*remove|sp_inside_square_empty\s*=\s*force|sp_inside_square_empty\s*=\s*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
 
@@ -978,7 +1060,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|sp_inside_square_oc_array=not_defined
+Choices=sp_inside_square_oc_array\s*=\s*ignore|sp_inside_square_oc_array\s*=\s*add|sp_inside_square_oc_array\s*=\s*remove|sp_inside_square_oc_array\s*=\s*force|sp_inside_square_oc_array\s*=\s*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
 
@@ -987,7 +1069,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|sp_after_comma=not_defined
+Choices=sp_after_comma\s*=\s*ignore|sp_after_comma\s*=\s*add|sp_after_comma\s*=\s*remove|sp_after_comma\s*=\s*force|sp_after_comma\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Comma|Add Sp After Comma|Remove Sp After Comma|Force Sp After Comma"
 ValueDefault=ignore
 
@@ -996,7 +1078,7 @@ Category=1
 Description="<html>Add or remove space before ',', i.e. 'a,b' vs. 'a ,b'.<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
+Choices=sp_before_comma\s*=\s*ignore|sp_before_comma\s*=\s*add|sp_before_comma\s*=\s*remove|sp_before_comma\s*=\s*force|sp_before_comma\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Comma|Add Sp Before Comma|Remove Sp Before Comma|Force Sp Before Comma"
 ValueDefault=remove
 
@@ -1005,7 +1087,7 @@ Category=1
 Description="<html>(C#, Vala) 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
+Choices=sp_after_mdatype_commas\s*=\s*ignore|sp_after_mdatype_commas\s*=\s*add|sp_after_mdatype_commas\s*=\s*remove|sp_after_mdatype_commas\s*=\s*force|sp_after_mdatype_commas\s*=\s*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
 
@@ -1014,7 +1096,7 @@ Category=1
 Description="<html>(C#, Vala) 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
+Choices=sp_before_mdatype_commas\s*=\s*ignore|sp_before_mdatype_commas\s*=\s*add|sp_before_mdatype_commas\s*=\s*remove|sp_before_mdatype_commas\s*=\s*force|sp_before_mdatype_commas\s*=\s*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
 
@@ -1023,7 +1105,7 @@ Category=1
 Description="<html>(C#, Vala) 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
+Choices=sp_between_mdatype_commas\s*=\s*ignore|sp_between_mdatype_commas\s*=\s*add|sp_between_mdatype_commas\s*=\s*remove|sp_between_mdatype_commas\s*=\s*force|sp_between_mdatype_commas\s*=\s*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
 
@@ -1032,7 +1114,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|sp_paren_comma=not_defined
+Choices=sp_paren_comma\s*=\s*ignore|sp_paren_comma\s*=\s*add|sp_paren_comma\s*=\s*remove|sp_paren_comma\s*=\s*force|sp_paren_comma\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Paren Comma|Add Sp Paren Comma|Remove Sp Paren Comma|Force Sp Paren Comma"
 ValueDefault=force
 
@@ -1041,7 +1123,7 @@ Category=1
 Description="<html>Add or remove space between a type and ':'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_type_colon=ignore|sp_type_colon=add|sp_type_colon=remove|sp_type_colon=force|sp_type_colon=not_defined
+Choices=sp_type_colon\s*=\s*ignore|sp_type_colon\s*=\s*add|sp_type_colon\s*=\s*remove|sp_type_colon\s*=\s*force|sp_type_colon\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Type Colon|Add Sp Type Colon|Remove Sp Type Colon|Force Sp Type Colon"
 ValueDefault=ignore
 
@@ -1050,7 +1132,7 @@ Category=1
 Description="<html>Add or remove space after the variadic '...' when preceded by a<br/>non-punctuator.<br/>The value REMOVE will be overridden with FORCE</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_ellipsis=ignore|sp_after_ellipsis=add|sp_after_ellipsis=remove|sp_after_ellipsis=force|sp_after_ellipsis=not_defined
+Choices=sp_after_ellipsis\s*=\s*ignore|sp_after_ellipsis\s*=\s*add|sp_after_ellipsis\s*=\s*remove|sp_after_ellipsis\s*=\s*force|sp_after_ellipsis\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Ellipsis|Add Sp After Ellipsis|Remove Sp After Ellipsis|Force Sp After Ellipsis"
 ValueDefault=ignore
 
@@ -1059,7 +1141,7 @@ Category=1
 Description="<html>Add or remove space before the variadic '...' when preceded by a<br/>non-punctuator.<br/>The value REMOVE will be overridden with FORCE</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
+Choices=sp_before_ellipsis\s*=\s*ignore|sp_before_ellipsis\s*=\s*add|sp_before_ellipsis\s*=\s*remove|sp_before_ellipsis\s*=\s*force|sp_before_ellipsis\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Ellipsis|Add Sp Before Ellipsis|Remove Sp Before Ellipsis|Force Sp Before Ellipsis"
 ValueDefault=ignore
 
@@ -1068,7 +1150,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|sp_type_ellipsis=not_defined
+Choices=sp_type_ellipsis\s*=\s*ignore|sp_type_ellipsis\s*=\s*add|sp_type_ellipsis\s*=\s*remove|sp_type_ellipsis\s*=\s*force|sp_type_ellipsis\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Type Ellipsis|Add Sp Type Ellipsis|Remove Sp Type Ellipsis|Force Sp Type Ellipsis"
 ValueDefault=ignore
 
@@ -1077,7 +1159,7 @@ Category=1
 Description="<html>Add or remove space between a '*' and '...'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_ptr_type_ellipsis=ignore|sp_ptr_type_ellipsis=add|sp_ptr_type_ellipsis=remove|sp_ptr_type_ellipsis=force|sp_ptr_type_ellipsis=not_defined
+Choices=sp_ptr_type_ellipsis\s*=\s*ignore|sp_ptr_type_ellipsis\s*=\s*add|sp_ptr_type_ellipsis\s*=\s*remove|sp_ptr_type_ellipsis\s*=\s*force|sp_ptr_type_ellipsis\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Ptr Type Ellipsis|Add Sp Ptr Type Ellipsis|Remove Sp Ptr Type Ellipsis|Force Sp Ptr Type Ellipsis"
 ValueDefault=ignore
 
@@ -1086,7 +1168,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|sp_paren_ellipsis=not_defined
+Choices=sp_paren_ellipsis\s*=\s*ignore|sp_paren_ellipsis\s*=\s*add|sp_paren_ellipsis\s*=\s*remove|sp_paren_ellipsis\s*=\s*force|sp_paren_ellipsis\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Paren Ellipsis|Add Sp Paren Ellipsis|Remove Sp Paren Ellipsis|Force Sp Paren Ellipsis"
 ValueDefault=ignore
 
@@ -1095,7 +1177,7 @@ Category=1
 Description="<html>Add or remove space between '&amp;&amp;' and '...'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_byref_ellipsis=ignore|sp_byref_ellipsis=add|sp_byref_ellipsis=remove|sp_byref_ellipsis=force|sp_byref_ellipsis=not_defined
+Choices=sp_byref_ellipsis\s*=\s*ignore|sp_byref_ellipsis\s*=\s*add|sp_byref_ellipsis\s*=\s*remove|sp_byref_ellipsis\s*=\s*force|sp_byref_ellipsis\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Byref Ellipsis|Add Sp Byref Ellipsis|Remove Sp Byref Ellipsis|Force Sp Byref Ellipsis"
 ValueDefault=ignore
 
@@ -1104,7 +1186,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|sp_paren_qualifier=not_defined
+Choices=sp_paren_qualifier\s*=\s*ignore|sp_paren_qualifier\s*=\s*add|sp_paren_qualifier\s*=\s*remove|sp_paren_qualifier\s*=\s*force|sp_paren_qualifier\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Paren Qualifier|Add Sp Paren Qualifier|Remove Sp Paren Qualifier|Force Sp Paren Qualifier"
 ValueDefault=ignore
 
@@ -1113,7 +1195,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|sp_paren_noexcept=not_defined
+Choices=sp_paren_noexcept\s*=\s*ignore|sp_paren_noexcept\s*=\s*add|sp_paren_noexcept\s*=\s*remove|sp_paren_noexcept\s*=\s*force|sp_paren_noexcept\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Paren Noexcept|Add Sp Paren Noexcept|Remove Sp Paren Noexcept|Force Sp Paren Noexcept"
 ValueDefault=ignore
 
@@ -1122,7 +1204,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|sp_after_class_colon=not_defined
+Choices=sp_after_class_colon\s*=\s*ignore|sp_after_class_colon\s*=\s*add|sp_after_class_colon\s*=\s*remove|sp_after_class_colon\s*=\s*force|sp_after_class_colon\s*=\s*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
 
@@ -1131,7 +1213,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|sp_before_class_colon=not_defined
+Choices=sp_before_class_colon\s*=\s*ignore|sp_before_class_colon\s*=\s*add|sp_before_class_colon\s*=\s*remove|sp_before_class_colon\s*=\s*force|sp_before_class_colon\s*=\s*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
 
@@ -1140,7 +1222,7 @@ Category=1
 Description="<html>Add or remove space after class constructor ':'.<br/><br/>Default: add</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
+Choices=sp_after_constr_colon\s*=\s*ignore|sp_after_constr_colon\s*=\s*add|sp_after_constr_colon\s*=\s*remove|sp_after_constr_colon\s*=\s*force|sp_after_constr_colon\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Constr Colon|Add Sp After Constr Colon|Remove Sp After Constr Colon|Force Sp After Constr Colon"
 ValueDefault=add
 
@@ -1149,7 +1231,7 @@ Category=1
 Description="<html>Add or remove space before class constructor ':'.<br/><br/>Default: add</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
+Choices=sp_before_constr_colon\s*=\s*ignore|sp_before_constr_colon\s*=\s*add|sp_before_constr_colon\s*=\s*remove|sp_before_constr_colon\s*=\s*force|sp_before_constr_colon\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Constr Colon|Add Sp Before Constr Colon|Remove Sp Before Constr Colon|Force Sp Before Constr Colon"
 ValueDefault=add
 
@@ -1158,7 +1240,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|sp_before_case_colon=not_defined
+Choices=sp_before_case_colon\s*=\s*ignore|sp_before_case_colon\s*=\s*add|sp_before_case_colon\s*=\s*remove|sp_before_case_colon\s*=\s*force|sp_before_case_colon\s*=\s*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
 
@@ -1167,7 +1249,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|sp_after_operator=not_defined
+Choices=sp_after_operator\s*=\s*ignore|sp_after_operator\s*=\s*add|sp_after_operator\s*=\s*remove|sp_after_operator\s*=\s*force|sp_after_operator\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Operator|Add Sp After Operator|Remove Sp After Operator|Force Sp After Operator"
 ValueDefault=ignore
 
@@ -1176,7 +1258,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|sp_after_operator_sym=not_defined
+Choices=sp_after_operator_sym\s*=\s*ignore|sp_after_operator_sym\s*=\s*add|sp_after_operator_sym\s*=\s*remove|sp_after_operator_sym\s*=\s*force|sp_after_operator_sym\s*=\s*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
 
@@ -1185,7 +1267,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|sp_after_operator_sym_empty=not_defined
+Choices=sp_after_operator_sym_empty\s*=\s*ignore|sp_after_operator_sym_empty\s*=\s*add|sp_after_operator_sym_empty\s*=\s*remove|sp_after_operator_sym_empty\s*=\s*force|sp_after_operator_sym_empty\s*=\s*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
 
@@ -1194,7 +1276,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|sp_after_cast=not_defined
+Choices=sp_after_cast\s*=\s*ignore|sp_after_cast\s*=\s*add|sp_after_cast\s*=\s*remove|sp_after_cast\s*=\s*force|sp_after_cast\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Cast|Add Sp After Cast|Remove Sp After Cast|Force Sp After Cast"
 ValueDefault=ignore
 
@@ -1203,7 +1285,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|sp_inside_paren_cast=not_defined
+Choices=sp_inside_paren_cast\s*=\s*ignore|sp_inside_paren_cast\s*=\s*add|sp_inside_paren_cast\s*=\s*remove|sp_inside_paren_cast\s*=\s*force|sp_inside_paren_cast\s*=\s*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
 
@@ -1212,7 +1294,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|sp_cpp_cast_paren=not_defined
+Choices=sp_cpp_cast_paren\s*=\s*ignore|sp_cpp_cast_paren\s*=\s*add|sp_cpp_cast_paren\s*=\s*remove|sp_cpp_cast_paren\s*=\s*force|sp_cpp_cast_paren\s*=\s*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
 
@@ -1221,7 +1303,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|sp_sizeof_paren=not_defined
+Choices=sp_sizeof_paren\s*=\s*ignore|sp_sizeof_paren\s*=\s*add|sp_sizeof_paren\s*=\s*remove|sp_sizeof_paren\s*=\s*force|sp_sizeof_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Sizeof Paren|Add Sp Sizeof Paren|Remove Sp Sizeof Paren|Force Sp Sizeof Paren"
 ValueDefault=ignore
 
@@ -1230,7 +1312,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|sp_sizeof_ellipsis=not_defined
+Choices=sp_sizeof_ellipsis\s*=\s*ignore|sp_sizeof_ellipsis\s*=\s*add|sp_sizeof_ellipsis\s*=\s*remove|sp_sizeof_ellipsis\s*=\s*force|sp_sizeof_ellipsis\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Sizeof Ellipsis|Add Sp Sizeof Ellipsis|Remove Sp Sizeof Ellipsis|Force Sp Sizeof Ellipsis"
 ValueDefault=ignore
 
@@ -1239,7 +1321,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|sp_sizeof_ellipsis_paren=not_defined
+Choices=sp_sizeof_ellipsis_paren\s*=\s*ignore|sp_sizeof_ellipsis_paren\s*=\s*add|sp_sizeof_ellipsis_paren\s*=\s*remove|sp_sizeof_ellipsis_paren\s*=\s*force|sp_sizeof_ellipsis_paren\s*=\s*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
 
@@ -1248,7 +1330,7 @@ Category=1
 Description="<html>Add or remove space between '...' and a parameter pack.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_ellipsis_parameter_pack=ignore|sp_ellipsis_parameter_pack=add|sp_ellipsis_parameter_pack=remove|sp_ellipsis_parameter_pack=force|sp_ellipsis_parameter_pack=not_defined
+Choices=sp_ellipsis_parameter_pack\s*=\s*ignore|sp_ellipsis_parameter_pack\s*=\s*add|sp_ellipsis_parameter_pack\s*=\s*remove|sp_ellipsis_parameter_pack\s*=\s*force|sp_ellipsis_parameter_pack\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Ellipsis Parameter Pack|Add Sp Ellipsis Parameter Pack|Remove Sp Ellipsis Parameter Pack|Force Sp Ellipsis Parameter Pack"
 ValueDefault=ignore
 
@@ -1257,7 +1339,7 @@ Category=1
 Description="<html>Add or remove space between a parameter pack and '...'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_parameter_pack_ellipsis=ignore|sp_parameter_pack_ellipsis=add|sp_parameter_pack_ellipsis=remove|sp_parameter_pack_ellipsis=force|sp_parameter_pack_ellipsis=not_defined
+Choices=sp_parameter_pack_ellipsis\s*=\s*ignore|sp_parameter_pack_ellipsis\s*=\s*add|sp_parameter_pack_ellipsis\s*=\s*remove|sp_parameter_pack_ellipsis\s*=\s*force|sp_parameter_pack_ellipsis\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Parameter Pack Ellipsis|Add Sp Parameter Pack Ellipsis|Remove Sp Parameter Pack Ellipsis|Force Sp Parameter Pack Ellipsis"
 ValueDefault=ignore
 
@@ -1266,7 +1348,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|sp_decltype_paren=not_defined
+Choices=sp_decltype_paren\s*=\s*ignore|sp_decltype_paren\s*=\s*add|sp_decltype_paren\s*=\s*remove|sp_decltype_paren\s*=\s*force|sp_decltype_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Decltype Paren|Add Sp Decltype Paren|Remove Sp Decltype Paren|Force Sp Decltype Paren"
 ValueDefault=ignore
 
@@ -1275,7 +1357,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|sp_after_tag=not_defined
+Choices=sp_after_tag\s*=\s*ignore|sp_after_tag\s*=\s*add|sp_after_tag\s*=\s*remove|sp_after_tag\s*=\s*force|sp_after_tag\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Tag|Add Sp After Tag|Remove Sp After Tag|Force Sp After Tag"
 ValueDefault=ignore
 
@@ -1284,7 +1366,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|sp_inside_braces_enum=not_defined
+Choices=sp_inside_braces_enum\s*=\s*ignore|sp_inside_braces_enum\s*=\s*add|sp_inside_braces_enum\s*=\s*remove|sp_inside_braces_enum\s*=\s*force|sp_inside_braces_enum\s*=\s*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
 
@@ -1293,7 +1375,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|sp_inside_braces_struct=not_defined
+Choices=sp_inside_braces_struct\s*=\s*ignore|sp_inside_braces_struct\s*=\s*add|sp_inside_braces_struct\s*=\s*remove|sp_inside_braces_struct\s*=\s*force|sp_inside_braces_struct\s*=\s*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
 
@@ -1302,7 +1384,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|sp_inside_braces_oc_dict=not_defined
+Choices=sp_inside_braces_oc_dict\s*=\s*ignore|sp_inside_braces_oc_dict\s*=\s*add|sp_inside_braces_oc_dict\s*=\s*remove|sp_inside_braces_oc_dict\s*=\s*force|sp_inside_braces_oc_dict\s*=\s*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
 
@@ -1311,7 +1393,7 @@ Category=1
 Description="<html>Add or remove space after open brace in an unnamed temporary<br/>direct-list-initialization<br/>if statement is a brace_init_lst<br/>works only if sp_brace_brace is set to ignore.</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
+Choices=sp_after_type_brace_init_lst_open\s*=\s*ignore|sp_after_type_brace_init_lst_open\s*=\s*add|sp_after_type_brace_init_lst_open\s*=\s*remove|sp_after_type_brace_init_lst_open\s*=\s*force|sp_after_type_brace_init_lst_open\s*=\s*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
 
@@ -1320,7 +1402,7 @@ Category=1
 Description="<html>Add or remove space before close brace in an unnamed temporary<br/>direct-list-initialization<br/>if statement is a brace_init_lst<br/>works only if sp_brace_brace is set to ignore.</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
+Choices=sp_before_type_brace_init_lst_close\s*=\s*ignore|sp_before_type_brace_init_lst_close\s*=\s*add|sp_before_type_brace_init_lst_close\s*=\s*remove|sp_before_type_brace_init_lst_close\s*=\s*force|sp_before_type_brace_init_lst_close\s*=\s*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
 
@@ -1329,7 +1411,7 @@ Category=1
 Description="<html>Add or remove space inside an unnamed temporary direct-list-initialization<br/>if statement is a brace_init_lst<br/>works only if sp_brace_brace is set to ignore<br/>works only if sp_before_type_brace_init_lst_close is set to ignore.</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
+Choices=sp_inside_type_brace_init_lst\s*=\s*ignore|sp_inside_type_brace_init_lst\s*=\s*add|sp_inside_type_brace_init_lst\s*=\s*remove|sp_inside_type_brace_init_lst\s*=\s*force|sp_inside_type_brace_init_lst\s*=\s*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
 
@@ -1338,16 +1420,16 @@ 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
+Choices=sp_inside_braces\s*=\s*ignore|sp_inside_braces\s*=\s*add|sp_inside_braces\s*=\s*remove|sp_inside_braces\s*=\s*force|sp_inside_braces\s*=\s*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>"
+Description="<html>Add or remove space inside '{}'.<br/>if empty.</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
+Choices=sp_inside_braces_empty\s*=\s*ignore|sp_inside_braces_empty\s*=\s*add|sp_inside_braces_empty\s*=\s*remove|sp_inside_braces_empty\s*=\s*force|sp_inside_braces_empty\s*=\s*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
 
@@ -1356,7 +1438,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|sp_trailing_return=not_defined
+Choices=sp_trailing_return\s*=\s*ignore|sp_trailing_return\s*=\s*add|sp_trailing_return\s*=\s*remove|sp_trailing_return\s*=\s*force|sp_trailing_return\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Trailing Return|Add Sp Trailing Return|Remove Sp Trailing Return|Force Sp Trailing Return"
 ValueDefault=ignore
 
@@ -1365,7 +1447,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|sp_type_func=not_defined
+Choices=sp_type_func\s*=\s*ignore|sp_type_func\s*=\s*add|sp_type_func\s*=\s*remove|sp_type_func\s*=\s*force|sp_type_func\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Type Func|Add Sp Type Func|Remove Sp Type Func|Force Sp Type Func"
 ValueDefault=ignore
 
@@ -1374,7 +1456,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|sp_type_brace_init_lst=not_defined
+Choices=sp_type_brace_init_lst\s*=\s*ignore|sp_type_brace_init_lst\s*=\s*add|sp_type_brace_init_lst\s*=\s*remove|sp_type_brace_init_lst\s*=\s*force|sp_type_brace_init_lst\s*=\s*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
 
@@ -1383,16 +1465,16 @@ 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
+Choices=sp_func_proto_paren\s*=\s*ignore|sp_func_proto_paren\s*=\s*add|sp_func_proto_paren\s*=\s*remove|sp_func_proto_paren\s*=\s*force|sp_func_proto_paren\s*=\s*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>"
+Description="<html>Add or remove space between function name and '()' on function declaration<br/>if empty.</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
+Choices=sp_func_proto_paren_empty\s*=\s*ignore|sp_func_proto_paren_empty\s*=\s*add|sp_func_proto_paren_empty\s*=\s*remove|sp_func_proto_paren_empty\s*=\s*force|sp_func_proto_paren_empty\s*=\s*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
 
@@ -1401,7 +1483,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|sp_func_type_paren=not_defined
+Choices=sp_func_type_paren\s*=\s*ignore|sp_func_type_paren\s*=\s*add|sp_func_type_paren\s*=\s*remove|sp_func_type_paren\s*=\s*force|sp_func_type_paren\s*=\s*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
 
@@ -1410,16 +1492,16 @@ 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
+Choices=sp_func_def_paren\s*=\s*ignore|sp_func_def_paren\s*=\s*add|sp_func_def_paren\s*=\s*remove|sp_func_def_paren\s*=\s*force|sp_func_def_paren\s*=\s*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>"
+Description="<html>Add or remove space between function name and '()' on function definition<br/>if empty.</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
+Choices=sp_func_def_paren_empty\s*=\s*ignore|sp_func_def_paren_empty\s*=\s*add|sp_func_def_paren_empty\s*=\s*remove|sp_func_def_paren_empty\s*=\s*force|sp_func_def_paren_empty\s*=\s*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
 
@@ -1428,7 +1510,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|sp_inside_fparens=not_defined
+Choices=sp_inside_fparens\s*=\s*ignore|sp_inside_fparens\s*=\s*add|sp_inside_fparens\s*=\s*remove|sp_inside_fparens\s*=\s*force|sp_inside_fparens\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Inside Fparens|Add Sp Inside Fparens|Remove Sp Inside Fparens|Force Sp Inside Fparens"
 ValueDefault=ignore
 
@@ -1437,16 +1519,43 @@ 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
+Choices=sp_inside_fparen\s*=\s*ignore|sp_inside_fparen\s*=\s*add|sp_inside_fparen\s*=\s*remove|sp_inside_fparen\s*=\s*force|sp_inside_fparen\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Inside Fparen|Add Sp Inside Fparen|Remove Sp Inside Fparen|Force Sp Inside Fparen"
 ValueDefault=ignore
 
+[Sp Func Call User Inside Rparen]
+Category=1
+Description="<html>Add or remove space inside user functor '(' and ')'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_func_call_user_inside_rparen\s*=\s*ignore|sp_func_call_user_inside_rparen\s*=\s*add|sp_func_call_user_inside_rparen\s*=\s*remove|sp_func_call_user_inside_rparen\s*=\s*force|sp_func_call_user_inside_rparen\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Func Call User Inside Rparen|Add Sp Func Call User Inside Rparen|Remove Sp Func Call User Inside Rparen|Force Sp Func Call User Inside Rparen"
+ValueDefault=ignore
+
+[Sp Inside Rparens]
+Category=1
+Description="<html>Add or remove space inside empty functor '()'.<br/>Overrides sp_after_angle unless use_sp_after_angle_always is set to true.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_inside_rparens\s*=\s*ignore|sp_inside_rparens\s*=\s*add|sp_inside_rparens\s*=\s*remove|sp_inside_rparens\s*=\s*force|sp_inside_rparens\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Inside Rparens|Add Sp Inside Rparens|Remove Sp Inside Rparens|Force Sp Inside Rparens"
+ValueDefault=ignore
+
+[Sp Inside Rparen]
+Category=1
+Description="<html>Add or remove space inside functor '(' and ')'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_inside_rparen\s*=\s*ignore|sp_inside_rparen\s*=\s*add|sp_inside_rparen\s*=\s*remove|sp_inside_rparen\s*=\s*force|sp_inside_rparen\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Inside Rparen|Add Sp Inside Rparen|Remove Sp Inside Rparen|Force Sp Inside Rparen"
+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
+Choices=sp_inside_tparen\s*=\s*ignore|sp_inside_tparen\s*=\s*add|sp_inside_tparen\s*=\s*remove|sp_inside_tparen\s*=\s*force|sp_inside_tparen\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Inside Tparen|Add Sp Inside Tparen|Remove Sp Inside Tparen|Force Sp Inside Tparen"
 ValueDefault=ignore
 
@@ -1455,7 +1564,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|sp_after_tparen_close=not_defined
+Choices=sp_after_tparen_close\s*=\s*ignore|sp_after_tparen_close\s*=\s*add|sp_after_tparen_close\s*=\s*remove|sp_after_tparen_close\s*=\s*force|sp_after_tparen_close\s*=\s*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
 
@@ -1464,7 +1573,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|sp_square_fparen=not_defined
+Choices=sp_square_fparen\s*=\s*ignore|sp_square_fparen\s*=\s*add|sp_square_fparen\s*=\s*remove|sp_square_fparen\s*=\s*force|sp_square_fparen\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Square Fparen|Add Sp Square Fparen|Remove Sp Square Fparen|Force Sp Square Fparen"
 ValueDefault=ignore
 
@@ -1473,7 +1582,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|sp_fparen_brace=not_defined
+Choices=sp_fparen_brace\s*=\s*ignore|sp_fparen_brace\s*=\s*add|sp_fparen_brace\s*=\s*remove|sp_fparen_brace\s*=\s*force|sp_fparen_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Fparen Brace|Add Sp Fparen Brace|Remove Sp Fparen Brace|Force Sp Fparen Brace"
 ValueDefault=ignore
 
@@ -1482,7 +1591,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|sp_fparen_brace_initializer=not_defined
+Choices=sp_fparen_brace_initializer\s*=\s*ignore|sp_fparen_brace_initializer\s*=\s*add|sp_fparen_brace_initializer\s*=\s*remove|sp_fparen_brace_initializer\s*=\s*force|sp_fparen_brace_initializer\s*=\s*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
 
@@ -1491,7 +1600,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|sp_fparen_dbrace=not_defined
+Choices=sp_fparen_dbrace\s*=\s*ignore|sp_fparen_dbrace\s*=\s*add|sp_fparen_dbrace\s*=\s*remove|sp_fparen_dbrace\s*=\s*force|sp_fparen_dbrace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Fparen Dbrace|Add Sp Fparen Dbrace|Remove Sp Fparen Dbrace|Force Sp Fparen Dbrace"
 ValueDefault=ignore
 
@@ -1500,7 +1609,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|sp_func_call_paren=not_defined
+Choices=sp_func_call_paren\s*=\s*ignore|sp_func_call_paren\s*=\s*add|sp_func_call_paren\s*=\s*remove|sp_func_call_paren\s*=\s*force|sp_func_call_paren\s*=\s*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
 
@@ -1509,7 +1618,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|sp_func_call_paren_empty=not_defined
+Choices=sp_func_call_paren_empty\s*=\s*ignore|sp_func_call_paren_empty\s*=\s*add|sp_func_call_paren_empty\s*=\s*remove|sp_func_call_paren_empty\s*=\s*force|sp_func_call_paren_empty\s*=\s*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
 
@@ -1518,7 +1627,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|sp_func_call_user_paren=not_defined
+Choices=sp_func_call_user_paren\s*=\s*ignore|sp_func_call_user_paren\s*=\s*add|sp_func_call_user_paren\s*=\s*remove|sp_func_call_user_paren\s*=\s*force|sp_func_call_user_paren\s*=\s*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
 
@@ -1527,7 +1636,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|sp_func_call_user_inside_fparen=not_defined
+Choices=sp_func_call_user_inside_fparen\s*=\s*ignore|sp_func_call_user_inside_fparen\s*=\s*add|sp_func_call_user_inside_fparen\s*=\s*remove|sp_func_call_user_inside_fparen\s*=\s*force|sp_func_call_user_inside_fparen\s*=\s*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
 
@@ -1536,7 +1645,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|sp_func_call_user_paren_paren=not_defined
+Choices=sp_func_call_user_paren_paren\s*=\s*ignore|sp_func_call_user_paren_paren\s*=\s*add|sp_func_call_user_paren_paren\s*=\s*remove|sp_func_call_user_paren_paren\s*=\s*force|sp_func_call_user_paren_paren\s*=\s*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
 
@@ -1545,7 +1654,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|sp_func_class_paren=not_defined
+Choices=sp_func_class_paren\s*=\s*ignore|sp_func_class_paren\s*=\s*add|sp_func_class_paren\s*=\s*remove|sp_func_class_paren\s*=\s*force|sp_func_class_paren\s*=\s*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
 
@@ -1554,7 +1663,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|sp_func_class_paren_empty=not_defined
+Choices=sp_func_class_paren_empty\s*=\s*ignore|sp_func_class_paren_empty\s*=\s*add|sp_func_class_paren_empty\s*=\s*remove|sp_func_class_paren_empty\s*=\s*force|sp_func_class_paren_empty\s*=\s*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
 
@@ -1563,7 +1672,7 @@ Category=1
 Description="<html>Add or remove space after 'return'.<br/><br/>Default: force</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_return=ignore|sp_return=add|sp_return=remove|sp_return=force|sp_return=not_defined
+Choices=sp_return\s*=\s*ignore|sp_return\s*=\s*add|sp_return\s*=\s*remove|sp_return\s*=\s*force|sp_return\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Return|Add Sp Return|Remove Sp Return|Force Sp Return"
 ValueDefault=force
 
@@ -1572,7 +1681,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|sp_return_paren=not_defined
+Choices=sp_return_paren\s*=\s*ignore|sp_return_paren\s*=\s*add|sp_return_paren\s*=\s*remove|sp_return_paren\s*=\s*force|sp_return_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Return Paren|Add Sp Return Paren|Remove Sp Return Paren|Force Sp Return Paren"
 ValueDefault=ignore
 
@@ -1581,7 +1690,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|sp_return_brace=not_defined
+Choices=sp_return_brace\s*=\s*ignore|sp_return_brace\s*=\s*add|sp_return_brace\s*=\s*remove|sp_return_brace\s*=\s*force|sp_return_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Return Brace|Add Sp Return Brace|Remove Sp Return Brace|Force Sp Return Brace"
 ValueDefault=ignore
 
@@ -1590,7 +1699,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|sp_attribute_paren=not_defined
+Choices=sp_attribute_paren\s*=\s*ignore|sp_attribute_paren\s*=\s*add|sp_attribute_paren\s*=\s*remove|sp_attribute_paren\s*=\s*force|sp_attribute_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Attribute Paren|Add Sp Attribute Paren|Remove Sp Attribute Paren|Force Sp Attribute Paren"
 ValueDefault=ignore
 
@@ -1599,7 +1708,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|sp_defined_paren=not_defined
+Choices=sp_defined_paren\s*=\s*ignore|sp_defined_paren\s*=\s*add|sp_defined_paren\s*=\s*remove|sp_defined_paren\s*=\s*force|sp_defined_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Defined Paren|Add Sp Defined Paren|Remove Sp Defined Paren|Force Sp Defined Paren"
 ValueDefault=ignore
 
@@ -1608,7 +1717,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|sp_throw_paren=not_defined
+Choices=sp_throw_paren\s*=\s*ignore|sp_throw_paren\s*=\s*add|sp_throw_paren\s*=\s*remove|sp_throw_paren\s*=\s*force|sp_throw_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Throw Paren|Add Sp Throw Paren|Remove Sp Throw Paren|Force Sp Throw Paren"
 ValueDefault=ignore
 
@@ -1617,7 +1726,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|sp_after_throw=not_defined
+Choices=sp_after_throw\s*=\s*ignore|sp_after_throw\s*=\s*add|sp_after_throw\s*=\s*remove|sp_after_throw\s*=\s*force|sp_after_throw\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Throw|Add Sp After Throw|Remove Sp After Throw|Force Sp After Throw"
 ValueDefault=ignore
 
@@ -1626,7 +1735,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|sp_catch_paren=not_defined
+Choices=sp_catch_paren\s*=\s*ignore|sp_catch_paren\s*=\s*add|sp_catch_paren\s*=\s*remove|sp_catch_paren\s*=\s*force|sp_catch_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Catch Paren|Add Sp Catch Paren|Remove Sp Catch Paren|Force Sp Catch Paren"
 ValueDefault=ignore
 
@@ -1635,7 +1744,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|sp_oc_catch_paren=not_defined
+Choices=sp_oc_catch_paren\s*=\s*ignore|sp_oc_catch_paren\s*=\s*add|sp_oc_catch_paren\s*=\s*remove|sp_oc_catch_paren\s*=\s*force|sp_oc_catch_paren\s*=\s*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
 
@@ -1644,7 +1753,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|sp_before_oc_proto_list=not_defined
+Choices=sp_before_oc_proto_list\s*=\s*ignore|sp_before_oc_proto_list\s*=\s*add|sp_before_oc_proto_list\s*=\s*remove|sp_before_oc_proto_list\s*=\s*force|sp_before_oc_proto_list\s*=\s*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
 
@@ -1653,7 +1762,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|sp_oc_classname_paren=not_defined
+Choices=sp_oc_classname_paren\s*=\s*ignore|sp_oc_classname_paren\s*=\s*add|sp_oc_classname_paren\s*=\s*remove|sp_oc_classname_paren\s*=\s*force|sp_oc_classname_paren\s*=\s*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
 
@@ -1662,7 +1771,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|sp_version_paren=not_defined
+Choices=sp_version_paren\s*=\s*ignore|sp_version_paren\s*=\s*add|sp_version_paren\s*=\s*remove|sp_version_paren\s*=\s*force|sp_version_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Version Paren|Add Sp Version Paren|Remove Sp Version Paren|Force Sp Version Paren"
 ValueDefault=ignore
 
@@ -1671,7 +1780,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|sp_scope_paren=not_defined
+Choices=sp_scope_paren\s*=\s*ignore|sp_scope_paren\s*=\s*add|sp_scope_paren\s*=\s*remove|sp_scope_paren\s*=\s*force|sp_scope_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Scope Paren|Add Sp Scope Paren|Remove Sp Scope Paren|Force Sp Scope Paren"
 ValueDefault=ignore
 
@@ -1680,7 +1789,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|sp_super_paren=not_defined
+Choices=sp_super_paren\s*=\s*ignore|sp_super_paren\s*=\s*add|sp_super_paren\s*=\s*remove|sp_super_paren\s*=\s*force|sp_super_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Super Paren|Add Sp Super Paren|Remove Sp Super Paren|Force Sp Super Paren"
 ValueDefault=remove
 
@@ -1689,7 +1798,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|sp_this_paren=not_defined
+Choices=sp_this_paren\s*=\s*ignore|sp_this_paren\s*=\s*add|sp_this_paren\s*=\s*remove|sp_this_paren\s*=\s*force|sp_this_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp This Paren|Add Sp This Paren|Remove Sp This Paren|Force Sp This Paren"
 ValueDefault=remove
 
@@ -1698,7 +1807,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|sp_macro=not_defined
+Choices=sp_macro\s*=\s*ignore|sp_macro\s*=\s*add|sp_macro\s*=\s*remove|sp_macro\s*=\s*force|sp_macro\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Macro|Add Sp Macro|Remove Sp Macro|Force Sp Macro"
 ValueDefault=ignore
 
@@ -1707,7 +1816,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|sp_macro_func=not_defined
+Choices=sp_macro_func\s*=\s*ignore|sp_macro_func\s*=\s*add|sp_macro_func\s*=\s*remove|sp_macro_func\s*=\s*force|sp_macro_func\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Macro Func|Add Sp Macro Func|Remove Sp Macro Func|Force Sp Macro Func"
 ValueDefault=ignore
 
@@ -1716,7 +1825,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|sp_else_brace=not_defined
+Choices=sp_else_brace\s*=\s*ignore|sp_else_brace\s*=\s*add|sp_else_brace\s*=\s*remove|sp_else_brace\s*=\s*force|sp_else_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Else Brace|Add Sp Else Brace|Remove Sp Else Brace|Force Sp Else Brace"
 ValueDefault=ignore
 
@@ -1725,7 +1834,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|sp_brace_else=not_defined
+Choices=sp_brace_else\s*=\s*ignore|sp_brace_else\s*=\s*add|sp_brace_else\s*=\s*remove|sp_brace_else\s*=\s*force|sp_brace_else\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Brace Else|Add Sp Brace Else|Remove Sp Brace Else|Force Sp Brace Else"
 ValueDefault=ignore
 
@@ -1734,7 +1843,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|sp_brace_typedef=not_defined
+Choices=sp_brace_typedef\s*=\s*ignore|sp_brace_typedef\s*=\s*add|sp_brace_typedef\s*=\s*remove|sp_brace_typedef\s*=\s*force|sp_brace_typedef\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Brace Typedef|Add Sp Brace Typedef|Remove Sp Brace Typedef|Force Sp Brace Typedef"
 ValueDefault=ignore
 
@@ -1743,7 +1852,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|sp_catch_brace=not_defined
+Choices=sp_catch_brace\s*=\s*ignore|sp_catch_brace\s*=\s*add|sp_catch_brace\s*=\s*remove|sp_catch_brace\s*=\s*force|sp_catch_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Catch Brace|Add Sp Catch Brace|Remove Sp Catch Brace|Force Sp Catch Brace"
 ValueDefault=ignore
 
@@ -1752,7 +1861,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|sp_oc_catch_brace=not_defined
+Choices=sp_oc_catch_brace\s*=\s*ignore|sp_oc_catch_brace\s*=\s*add|sp_oc_catch_brace\s*=\s*remove|sp_oc_catch_brace\s*=\s*force|sp_oc_catch_brace\s*=\s*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
 
@@ -1761,7 +1870,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|sp_brace_catch=not_defined
+Choices=sp_brace_catch\s*=\s*ignore|sp_brace_catch\s*=\s*add|sp_brace_catch\s*=\s*remove|sp_brace_catch\s*=\s*force|sp_brace_catch\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Brace Catch|Add Sp Brace Catch|Remove Sp Brace Catch|Force Sp Brace Catch"
 ValueDefault=ignore
 
@@ -1770,7 +1879,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|sp_oc_brace_catch=not_defined
+Choices=sp_oc_brace_catch\s*=\s*ignore|sp_oc_brace_catch\s*=\s*add|sp_oc_brace_catch\s*=\s*remove|sp_oc_brace_catch\s*=\s*force|sp_oc_brace_catch\s*=\s*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
 
@@ -1779,7 +1888,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|sp_finally_brace=not_defined
+Choices=sp_finally_brace\s*=\s*ignore|sp_finally_brace\s*=\s*add|sp_finally_brace\s*=\s*remove|sp_finally_brace\s*=\s*force|sp_finally_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Finally Brace|Add Sp Finally Brace|Remove Sp Finally Brace|Force Sp Finally Brace"
 ValueDefault=ignore
 
@@ -1788,7 +1897,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|sp_brace_finally=not_defined
+Choices=sp_brace_finally\s*=\s*ignore|sp_brace_finally\s*=\s*add|sp_brace_finally\s*=\s*remove|sp_brace_finally\s*=\s*force|sp_brace_finally\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Brace Finally|Add Sp Brace Finally|Remove Sp Brace Finally|Force Sp Brace Finally"
 ValueDefault=ignore
 
@@ -1797,7 +1906,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|sp_try_brace=not_defined
+Choices=sp_try_brace\s*=\s*ignore|sp_try_brace\s*=\s*add|sp_try_brace\s*=\s*remove|sp_try_brace\s*=\s*force|sp_try_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Try Brace|Add Sp Try Brace|Remove Sp Try Brace|Force Sp Try Brace"
 ValueDefault=ignore
 
@@ -1806,7 +1915,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|sp_getset_brace=not_defined
+Choices=sp_getset_brace\s*=\s*ignore|sp_getset_brace\s*=\s*add|sp_getset_brace\s*=\s*remove|sp_getset_brace\s*=\s*force|sp_getset_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Getset Brace|Add Sp Getset Brace|Remove Sp Getset Brace|Force Sp Getset Brace"
 ValueDefault=ignore
 
@@ -1815,7 +1924,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|sp_word_brace_init_lst=not_defined
+Choices=sp_word_brace_init_lst\s*=\s*ignore|sp_word_brace_init_lst\s*=\s*add|sp_word_brace_init_lst\s*=\s*remove|sp_word_brace_init_lst\s*=\s*force|sp_word_brace_init_lst\s*=\s*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
 
@@ -1824,7 +1933,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|sp_word_brace_ns=not_defined
+Choices=sp_word_brace_ns\s*=\s*ignore|sp_word_brace_ns\s*=\s*add|sp_word_brace_ns\s*=\s*remove|sp_word_brace_ns\s*=\s*force|sp_word_brace_ns\s*=\s*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
 
@@ -1833,7 +1942,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|sp_before_dc=not_defined
+Choices=sp_before_dc\s*=\s*ignore|sp_before_dc\s*=\s*add|sp_before_dc\s*=\s*remove|sp_before_dc\s*=\s*force|sp_before_dc\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Dc|Add Sp Before Dc|Remove Sp Before Dc|Force Sp Before Dc"
 ValueDefault=ignore
 
@@ -1842,7 +1951,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|sp_after_dc=not_defined
+Choices=sp_after_dc\s*=\s*ignore|sp_after_dc\s*=\s*add|sp_after_dc\s*=\s*remove|sp_after_dc\s*=\s*force|sp_after_dc\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Dc|Add Sp After Dc|Remove Sp After Dc|Force Sp After Dc"
 ValueDefault=ignore
 
@@ -1851,7 +1960,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|sp_d_array_colon=not_defined
+Choices=sp_d_array_colon\s*=\s*ignore|sp_d_array_colon\s*=\s*add|sp_d_array_colon\s*=\s*remove|sp_d_array_colon\s*=\s*force|sp_d_array_colon\s*=\s*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
 
@@ -1860,7 +1969,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|sp_not=not_defined
+Choices=sp_not\s*=\s*ignore|sp_not\s*=\s*add|sp_not\s*=\s*remove|sp_not\s*=\s*force|sp_not\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Not|Add Sp Not|Remove Sp Not|Force Sp Not"
 ValueDefault=remove
 
@@ -1869,7 +1978,7 @@ Category=1
 Description="<html>Add or remove space between two '!' (not) unary operators.<br/>If set to ignore, sp_not will be used.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_not_not=ignore|sp_not_not=add|sp_not_not=remove|sp_not_not=force|sp_not_not=not_defined
+Choices=sp_not_not\s*=\s*ignore|sp_not_not\s*=\s*add|sp_not_not\s*=\s*remove|sp_not_not\s*=\s*force|sp_not_not\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Not Not|Add Sp Not Not|Remove Sp Not Not|Force Sp Not Not"
 ValueDefault=ignore
 
@@ -1878,7 +1987,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|sp_inv=not_defined
+Choices=sp_inv\s*=\s*ignore|sp_inv\s*=\s*add|sp_inv\s*=\s*remove|sp_inv\s*=\s*force|sp_inv\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Inv|Add Sp Inv|Remove Sp Inv|Force Sp Inv"
 ValueDefault=remove
 
@@ -1887,7 +1996,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|sp_addr=not_defined
+Choices=sp_addr\s*=\s*ignore|sp_addr\s*=\s*add|sp_addr\s*=\s*remove|sp_addr\s*=\s*force|sp_addr\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Addr|Add Sp Addr|Remove Sp Addr|Force Sp Addr"
 ValueDefault=remove
 
@@ -1896,7 +2005,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|sp_member=not_defined
+Choices=sp_member\s*=\s*ignore|sp_member\s*=\s*add|sp_member\s*=\s*remove|sp_member\s*=\s*force|sp_member\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Member|Add Sp Member|Remove Sp Member|Force Sp Member"
 ValueDefault=remove
 
@@ -1905,7 +2014,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|sp_deref=not_defined
+Choices=sp_deref\s*=\s*ignore|sp_deref\s*=\s*add|sp_deref\s*=\s*remove|sp_deref\s*=\s*force|sp_deref\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Deref|Add Sp Deref|Remove Sp Deref|Force Sp Deref"
 ValueDefault=remove
 
@@ -1914,7 +2023,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|sp_sign=not_defined
+Choices=sp_sign\s*=\s*ignore|sp_sign\s*=\s*add|sp_sign\s*=\s*remove|sp_sign\s*=\s*force|sp_sign\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Sign|Add Sp Sign|Remove Sp Sign|Force Sp Sign"
 ValueDefault=remove
 
@@ -1923,7 +2032,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|sp_incdec=not_defined
+Choices=sp_incdec\s*=\s*ignore|sp_incdec\s*=\s*add|sp_incdec\s*=\s*remove|sp_incdec\s*=\s*force|sp_incdec\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Incdec|Add Sp Incdec|Remove Sp Incdec|Force Sp Incdec"
 ValueDefault=remove
 
@@ -1932,7 +2041,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|sp_before_nl_cont=not_defined
+Choices=sp_before_nl_cont\s*=\s*ignore|sp_before_nl_cont\s*=\s*add|sp_before_nl_cont\s*=\s*remove|sp_before_nl_cont\s*=\s*force|sp_before_nl_cont\s*=\s*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
 
@@ -1941,7 +2050,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|sp_after_oc_scope=not_defined
+Choices=sp_after_oc_scope\s*=\s*ignore|sp_after_oc_scope\s*=\s*add|sp_after_oc_scope\s*=\s*remove|sp_after_oc_scope\s*=\s*force|sp_after_oc_scope\s*=\s*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
 
@@ -1950,7 +2059,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|sp_after_oc_colon=not_defined
+Choices=sp_after_oc_colon\s*=\s*ignore|sp_after_oc_colon\s*=\s*add|sp_after_oc_colon\s*=\s*remove|sp_after_oc_colon\s*=\s*force|sp_after_oc_colon\s*=\s*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
 
@@ -1959,7 +2068,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|sp_before_oc_colon=not_defined
+Choices=sp_before_oc_colon\s*=\s*ignore|sp_before_oc_colon\s*=\s*add|sp_before_oc_colon\s*=\s*remove|sp_before_oc_colon\s*=\s*force|sp_before_oc_colon\s*=\s*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
 
@@ -1968,7 +2077,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|sp_after_oc_dict_colon=not_defined
+Choices=sp_after_oc_dict_colon\s*=\s*ignore|sp_after_oc_dict_colon\s*=\s*add|sp_after_oc_dict_colon\s*=\s*remove|sp_after_oc_dict_colon\s*=\s*force|sp_after_oc_dict_colon\s*=\s*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
 
@@ -1977,7 +2086,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|sp_before_oc_dict_colon=not_defined
+Choices=sp_before_oc_dict_colon\s*=\s*ignore|sp_before_oc_dict_colon\s*=\s*add|sp_before_oc_dict_colon\s*=\s*remove|sp_before_oc_dict_colon\s*=\s*force|sp_before_oc_dict_colon\s*=\s*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
 
@@ -1986,7 +2095,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|sp_after_send_oc_colon=not_defined
+Choices=sp_after_send_oc_colon\s*=\s*ignore|sp_after_send_oc_colon\s*=\s*add|sp_after_send_oc_colon\s*=\s*remove|sp_after_send_oc_colon\s*=\s*force|sp_after_send_oc_colon\s*=\s*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
 
@@ -1995,7 +2104,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|sp_before_send_oc_colon=not_defined
+Choices=sp_before_send_oc_colon\s*=\s*ignore|sp_before_send_oc_colon\s*=\s*add|sp_before_send_oc_colon\s*=\s*remove|sp_before_send_oc_colon\s*=\s*force|sp_before_send_oc_colon\s*=\s*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
 
@@ -2004,7 +2113,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|sp_after_oc_type=not_defined
+Choices=sp_after_oc_type\s*=\s*ignore|sp_after_oc_type\s*=\s*add|sp_after_oc_type\s*=\s*remove|sp_after_oc_type\s*=\s*force|sp_after_oc_type\s*=\s*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
 
@@ -2013,7 +2122,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|sp_after_oc_return_type=not_defined
+Choices=sp_after_oc_return_type\s*=\s*ignore|sp_after_oc_return_type\s*=\s*add|sp_after_oc_return_type\s*=\s*remove|sp_after_oc_return_type\s*=\s*force|sp_after_oc_return_type\s*=\s*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
 
@@ -2022,7 +2131,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|sp_after_oc_at_sel=not_defined
+Choices=sp_after_oc_at_sel\s*=\s*ignore|sp_after_oc_at_sel\s*=\s*add|sp_after_oc_at_sel\s*=\s*remove|sp_after_oc_at_sel\s*=\s*force|sp_after_oc_at_sel\s*=\s*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
 
@@ -2031,7 +2140,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|sp_after_oc_at_sel_parens=not_defined
+Choices=sp_after_oc_at_sel_parens\s*=\s*ignore|sp_after_oc_at_sel_parens\s*=\s*add|sp_after_oc_at_sel_parens\s*=\s*remove|sp_after_oc_at_sel_parens\s*=\s*force|sp_after_oc_at_sel_parens\s*=\s*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
 
@@ -2040,7 +2149,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|sp_inside_oc_at_sel_parens=not_defined
+Choices=sp_inside_oc_at_sel_parens\s*=\s*ignore|sp_inside_oc_at_sel_parens\s*=\s*add|sp_inside_oc_at_sel_parens\s*=\s*remove|sp_inside_oc_at_sel_parens\s*=\s*force|sp_inside_oc_at_sel_parens\s*=\s*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
 
@@ -2049,7 +2158,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|sp_before_oc_block_caret=not_defined
+Choices=sp_before_oc_block_caret\s*=\s*ignore|sp_before_oc_block_caret\s*=\s*add|sp_before_oc_block_caret\s*=\s*remove|sp_before_oc_block_caret\s*=\s*force|sp_before_oc_block_caret\s*=\s*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
 
@@ -2058,7 +2167,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|sp_after_oc_block_caret=not_defined
+Choices=sp_after_oc_block_caret\s*=\s*ignore|sp_after_oc_block_caret\s*=\s*add|sp_after_oc_block_caret\s*=\s*remove|sp_after_oc_block_caret\s*=\s*force|sp_after_oc_block_caret\s*=\s*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
 
@@ -2067,7 +2176,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|sp_after_oc_msg_receiver=not_defined
+Choices=sp_after_oc_msg_receiver\s*=\s*ignore|sp_after_oc_msg_receiver\s*=\s*add|sp_after_oc_msg_receiver\s*=\s*remove|sp_after_oc_msg_receiver\s*=\s*force|sp_after_oc_msg_receiver\s*=\s*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
 
@@ -2076,7 +2185,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|sp_after_oc_property=not_defined
+Choices=sp_after_oc_property\s*=\s*ignore|sp_after_oc_property\s*=\s*add|sp_after_oc_property\s*=\s*remove|sp_after_oc_property\s*=\s*force|sp_after_oc_property\s*=\s*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
 
@@ -2085,7 +2194,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|sp_after_oc_synchronized=not_defined
+Choices=sp_after_oc_synchronized\s*=\s*ignore|sp_after_oc_synchronized\s*=\s*add|sp_after_oc_synchronized\s*=\s*remove|sp_after_oc_synchronized\s*=\s*force|sp_after_oc_synchronized\s*=\s*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
 
@@ -2094,7 +2203,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|sp_cond_colon=not_defined
+Choices=sp_cond_colon\s*=\s*ignore|sp_cond_colon\s*=\s*add|sp_cond_colon\s*=\s*remove|sp_cond_colon\s*=\s*force|sp_cond_colon\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Cond Colon|Add Sp Cond Colon|Remove Sp Cond Colon|Force Sp Cond Colon"
 ValueDefault=ignore
 
@@ -2103,7 +2212,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|sp_cond_colon_before=not_defined
+Choices=sp_cond_colon_before\s*=\s*ignore|sp_cond_colon_before\s*=\s*add|sp_cond_colon_before\s*=\s*remove|sp_cond_colon_before\s*=\s*force|sp_cond_colon_before\s*=\s*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
 
@@ -2112,7 +2221,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|sp_cond_colon_after=not_defined
+Choices=sp_cond_colon_after\s*=\s*ignore|sp_cond_colon_after\s*=\s*add|sp_cond_colon_after\s*=\s*remove|sp_cond_colon_after\s*=\s*force|sp_cond_colon_after\s*=\s*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
 
@@ -2121,7 +2230,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|sp_cond_question=not_defined
+Choices=sp_cond_question\s*=\s*ignore|sp_cond_question\s*=\s*add|sp_cond_question\s*=\s*remove|sp_cond_question\s*=\s*force|sp_cond_question\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Cond Question|Add Sp Cond Question|Remove Sp Cond Question|Force Sp Cond Question"
 ValueDefault=ignore
 
@@ -2130,7 +2239,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|sp_cond_question_before=not_defined
+Choices=sp_cond_question_before\s*=\s*ignore|sp_cond_question_before\s*=\s*add|sp_cond_question_before\s*=\s*remove|sp_cond_question_before\s*=\s*force|sp_cond_question_before\s*=\s*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
 
@@ -2139,7 +2248,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|sp_cond_question_after=not_defined
+Choices=sp_cond_question_after\s*=\s*ignore|sp_cond_question_after\s*=\s*add|sp_cond_question_after\s*=\s*remove|sp_cond_question_after\s*=\s*force|sp_cond_question_after\s*=\s*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
 
@@ -2148,7 +2257,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|sp_cond_ternary_short=not_defined
+Choices=sp_cond_ternary_short\s*=\s*ignore|sp_cond_ternary_short\s*=\s*add|sp_cond_ternary_short\s*=\s*remove|sp_cond_ternary_short\s*=\s*force|sp_cond_ternary_short\s*=\s*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
 
@@ -2157,7 +2266,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|sp_case_label=not_defined
+Choices=sp_case_label\s*=\s*ignore|sp_case_label\s*=\s*add|sp_case_label\s*=\s*remove|sp_case_label\s*=\s*force|sp_case_label\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Case Label|Add Sp Case Label|Remove Sp Case Label|Force Sp Case Label"
 ValueDefault=ignore
 
@@ -2166,7 +2275,7 @@ 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
+Choices=sp_range\s*=\s*ignore|sp_range\s*=\s*add|sp_range\s*=\s*remove|sp_range\s*=\s*force|sp_range\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Range|Add Sp Range|Remove Sp Range|Force Sp Range"
 ValueDefault=ignore
 
@@ -2175,7 +2284,7 @@ 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
+Choices=sp_after_for_colon\s*=\s*ignore|sp_after_for_colon\s*=\s*add|sp_after_for_colon\s*=\s*remove|sp_after_for_colon\s*=\s*force|sp_after_for_colon\s*=\s*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
 
@@ -2184,7 +2293,7 @@ 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
+Choices=sp_before_for_colon\s*=\s*ignore|sp_before_for_colon\s*=\s*add|sp_before_for_colon\s*=\s*remove|sp_before_for_colon\s*=\s*force|sp_before_for_colon\s*=\s*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
 
@@ -2193,7 +2302,7 @@ 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
+Choices=sp_extern_paren\s*=\s*ignore|sp_extern_paren\s*=\s*add|sp_extern_paren\s*=\s*remove|sp_extern_paren\s*=\s*force|sp_extern_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Extern Paren|Add Sp Extern Paren|Remove Sp Extern Paren|Force Sp Extern Paren"
 ValueDefault=ignore
 
@@ -2202,16 +2311,32 @@ 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
+Choices=sp_cmt_cpp_start\s*=\s*ignore|sp_cmt_cpp_start\s*=\s*add|sp_cmt_cpp_start\s*=\s*remove|sp_cmt_cpp_start\s*=\s*force|sp_cmt_cpp_start\s*=\s*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 Pvs]
+Category=1
+Description="<html>remove space after the '//' and the pvs command '-V1234',<br/>only works with sp_cmt_cpp_start set to add or force.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=sp_cmt_cpp_pvs\s*=\s*true|sp_cmt_cpp_pvs\s*=\s*false
+ValueDefault=false
+
+[Sp Cmt Cpp Lint]
+Category=1
+Description="<html>remove space after the '//' and the command 'lint',<br/>only works with sp_cmt_cpp_start set to add or force.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=sp_cmt_cpp_lint\s*=\s*true|sp_cmt_cpp_lint\s*=\s*false
+ValueDefault=false
+
 [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
+Choices=sp_cmt_cpp_region\s*=\s*ignore|sp_cmt_cpp_region\s*=\s*add|sp_cmt_cpp_region\s*=\s*remove|sp_cmt_cpp_region\s*=\s*force|sp_cmt_cpp_region\s*=\s*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
 
@@ -2220,7 +2345,7 @@ 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
+TrueFalse=sp_cmt_cpp_doxygen\s*=\s*true|sp_cmt_cpp_doxygen\s*=\s*false
 ValueDefault=false
 
 [Sp Cmt Cpp Qttr]
@@ -2228,7 +2353,7 @@ 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
+TrueFalse=sp_cmt_cpp_qttr\s*=\s*true|sp_cmt_cpp_qttr\s*=\s*false
 ValueDefault=false
 
 [Sp Endif Cmt]
@@ -2236,7 +2361,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|sp_endif_cmt=not_defined
+Choices=sp_endif_cmt\s*=\s*ignore|sp_endif_cmt\s*=\s*add|sp_endif_cmt\s*=\s*remove|sp_endif_cmt\s*=\s*force|sp_endif_cmt\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Endif Cmt|Add Sp Endif Cmt|Remove Sp Endif Cmt|Force Sp Endif Cmt"
 ValueDefault=ignore
 
@@ -2245,7 +2370,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|sp_after_new=not_defined
+Choices=sp_after_new\s*=\s*ignore|sp_after_new\s*=\s*add|sp_after_new\s*=\s*remove|sp_after_new\s*=\s*force|sp_after_new\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After New|Add Sp After New|Remove Sp After New|Force Sp After New"
 ValueDefault=ignore
 
@@ -2254,7 +2379,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|sp_between_new_paren=not_defined
+Choices=sp_between_new_paren\s*=\s*ignore|sp_between_new_paren\s*=\s*add|sp_between_new_paren\s*=\s*remove|sp_between_new_paren\s*=\s*force|sp_between_new_paren\s*=\s*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
 
@@ -2263,7 +2388,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|sp_after_newop_paren=not_defined
+Choices=sp_after_newop_paren\s*=\s*ignore|sp_after_newop_paren\s*=\s*add|sp_after_newop_paren\s*=\s*remove|sp_after_newop_paren\s*=\s*force|sp_after_newop_paren\s*=\s*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
 
@@ -2272,7 +2397,7 @@ Category=1
 Description="<html>Add or remove space inside parentheses 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
+Choices=sp_inside_newop_paren\s*=\s*ignore|sp_inside_newop_paren\s*=\s*add|sp_inside_newop_paren\s*=\s*remove|sp_inside_newop_paren\s*=\s*force|sp_inside_newop_paren\s*=\s*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
 
@@ -2281,7 +2406,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|sp_inside_newop_paren_open=not_defined
+Choices=sp_inside_newop_paren_open\s*=\s*ignore|sp_inside_newop_paren_open\s*=\s*add|sp_inside_newop_paren_open\s*=\s*remove|sp_inside_newop_paren_open\s*=\s*force|sp_inside_newop_paren_open\s*=\s*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
 
@@ -2290,7 +2415,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|sp_inside_newop_paren_close=not_defined
+Choices=sp_inside_newop_paren_close\s*=\s*ignore|sp_inside_newop_paren_close\s*=\s*add|sp_inside_newop_paren_close\s*=\s*remove|sp_inside_newop_paren_close\s*=\s*force|sp_inside_newop_paren_close\s*=\s*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
 
@@ -2299,7 +2424,7 @@ Category=1
 Description="<html>Add or remove space before a trailing comment.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_tr_cmt=ignore|sp_before_tr_cmt=add|sp_before_tr_cmt=remove|sp_before_tr_cmt=force|sp_before_tr_cmt=not_defined
+Choices=sp_before_tr_cmt\s*=\s*ignore|sp_before_tr_cmt\s*=\s*add|sp_before_tr_cmt\s*=\s*remove|sp_before_tr_cmt\s*=\s*force|sp_before_tr_cmt\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Tr Cmt|Add Sp Before Tr Cmt|Remove Sp Before Tr Cmt|Force Sp Before Tr Cmt"
 ValueDefault=ignore
 
@@ -2308,7 +2433,7 @@ Category=1
 Description="<html>Number of spaces before a trailing comment.</html>"
 Enabled=false
 EditorType=numeric
-CallName="sp_num_before_tr_cmt="
+CallName="sp_num_before_tr_cmt\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2318,7 +2443,7 @@ Category=1
 Description="<html>Add or remove space before an embedded comment.<br/><br/>Default: force</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_emb_cmt=ignore|sp_before_emb_cmt=add|sp_before_emb_cmt=remove|sp_before_emb_cmt=force|sp_before_emb_cmt=not_defined
+Choices=sp_before_emb_cmt\s*=\s*ignore|sp_before_emb_cmt\s*=\s*add|sp_before_emb_cmt\s*=\s*remove|sp_before_emb_cmt\s*=\s*force|sp_before_emb_cmt\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Emb Cmt|Add Sp Before Emb Cmt|Remove Sp Before Emb Cmt|Force Sp Before Emb Cmt"
 ValueDefault=force
 
@@ -2327,7 +2452,7 @@ Category=1
 Description="<html>Number of spaces before an embedded comment.<br/><br/>Default: 1</html>"
 Enabled=false
 EditorType=numeric
-CallName="sp_num_before_emb_cmt="
+CallName="sp_num_before_emb_cmt\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=1
@@ -2337,7 +2462,7 @@ Category=1
 Description="<html>Add or remove space after an embedded comment.<br/><br/>Default: force</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_emb_cmt=ignore|sp_after_emb_cmt=add|sp_after_emb_cmt=remove|sp_after_emb_cmt=force|sp_after_emb_cmt=not_defined
+Choices=sp_after_emb_cmt\s*=\s*ignore|sp_after_emb_cmt\s*=\s*add|sp_after_emb_cmt\s*=\s*remove|sp_after_emb_cmt\s*=\s*force|sp_after_emb_cmt\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Emb Cmt|Add Sp After Emb Cmt|Remove Sp After Emb Cmt|Force Sp After Emb Cmt"
 ValueDefault=force
 
@@ -2346,7 +2471,7 @@ Category=1
 Description="<html>Number of spaces after an embedded comment.<br/><br/>Default: 1</html>"
 Enabled=false
 EditorType=numeric
-CallName="sp_num_after_emb_cmt="
+CallName="sp_num_after_emb_cmt\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=1
@@ -2356,7 +2481,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|sp_annotation_paren=not_defined
+Choices=sp_annotation_paren\s*=\s*ignore|sp_annotation_paren\s*=\s*add|sp_annotation_paren\s*=\s*remove|sp_annotation_paren\s*=\s*force|sp_annotation_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Annotation Paren|Add Sp Annotation Paren|Remove Sp Annotation Paren|Force Sp Annotation Paren"
 ValueDefault=ignore
 
@@ -2365,7 +2490,7 @@ 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
+TrueFalse=sp_skip_vbrace_tokens\s*=\s*true|sp_skip_vbrace_tokens\s*=\s*false
 ValueDefault=false
 
 [Sp After Noexcept]
@@ -2373,7 +2498,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|sp_after_noexcept=not_defined
+Choices=sp_after_noexcept\s*=\s*ignore|sp_after_noexcept\s*=\s*add|sp_after_noexcept\s*=\s*remove|sp_after_noexcept\s*=\s*force|sp_after_noexcept\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Noexcept|Add Sp After Noexcept|Remove Sp After Noexcept|Force Sp After Noexcept"
 ValueDefault=ignore
 
@@ -2382,16 +2507,34 @@ 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
+Choices=sp_vala_after_translation\s*=\s*ignore|sp_vala_after_translation\s*=\s*add|sp_vala_after_translation\s*=\s*remove|sp_vala_after_translation\s*=\s*force|sp_vala_after_translation\s*=\s*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
 
+[Sp Before Bit Colon]
+Category=1
+Description="<html>Add or remove space before a bit colon ':'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_before_bit_colon\s*=\s*ignore|sp_before_bit_colon\s*=\s*add|sp_before_bit_colon\s*=\s*remove|sp_before_bit_colon\s*=\s*force|sp_before_bit_colon\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Before Bit Colon|Add Sp Before Bit Colon|Remove Sp Before Bit Colon|Force Sp Before Bit Colon"
+ValueDefault=ignore
+
+[Sp After Bit Colon]
+Category=1
+Description="<html>Add or remove space after a bit colon ':'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_after_bit_colon\s*=\s*ignore|sp_after_bit_colon\s*=\s*add|sp_after_bit_colon\s*=\s*remove|sp_after_bit_colon\s*=\s*force|sp_after_bit_colon\s*=\s*not_defined
+ChoicesReadable="Ignore Sp After Bit Colon|Add Sp After Bit Colon|Remove Sp After Bit Colon|Force Sp After Bit Colon"
+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
+TrueFalse=force_tab_after_define\s*=\s*true|force_tab_after_define\s*=\s*false
 ValueDefault=false
 
 [Indent Columns]
@@ -2399,7 +2542,7 @@ 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="
+CallName="indent_columns\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=8
@@ -2409,7 +2552,7 @@ Category=2
 Description="<html>Whether to ignore indent for the first continuation line. Subsequent<br/>continuation lines will still be indented to match the first.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_ignore_first_continue=true|indent_ignore_first_continue=false
+TrueFalse=indent_ignore_first_continue\s*=\s*true|indent_ignore_first_continue\s*=\s*false
 ValueDefault=false
 
 [Indent Continue]
@@ -2417,7 +2560,7 @@ 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.<br/>Requires indent_ignore_first_continue=false.</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_continue="
+CallName="indent_continue\s*=\s*"
 MinVal=-16
 MaxVal=16
 ValueDefault=0
@@ -2427,7 +2570,7 @@ 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.<br/>Requires indent_ignore_first_continue=false.</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_continue_class_head="
+CallName="indent_continue_class_head\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2437,7 +2580,7 @@ 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
+TrueFalse=indent_single_newlines\s*=\s*true|indent_single_newlines\s*=\s*false
 ValueDefault=false
 
 [Indent Param]
@@ -2445,7 +2588,7 @@ 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="
+CallName="indent_param\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2455,7 +2598,7 @@ 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"
+Choices="indent_with_tabs\s*=\s*0|indent_with_tabs\s*=\s*1|indent_with_tabs\s*=\s*2"
 ChoicesReadable="Spaces only|Indent with tabs, align with spaces|Indent and align with tabs"
 ValueDefault=1
 
@@ -2464,7 +2607,7 @@ 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
+TrueFalse=indent_cmt_with_tabs\s*=\s*true|indent_cmt_with_tabs\s*=\s*false
 ValueDefault=false
 
 [Indent Align String]
@@ -2472,7 +2615,7 @@ 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
+TrueFalse=indent_align_string\s*=\s*true|indent_align_string\s*=\s*false
 ValueDefault=false
 
 [Indent Xml String]
@@ -2480,7 +2623,7 @@ 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="
+CallName="indent_xml_string\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2490,7 +2633,7 @@ Category=2
 Description="<html>Spaces to indent '{' from level.</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_brace="
+CallName="indent_brace\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2500,7 +2643,7 @@ Category=2
 Description="<html>Whether braces are indented to the body level.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_braces=true|indent_braces=false
+TrueFalse=indent_braces\s*=\s*true|indent_braces\s*=\s*false
 ValueDefault=false
 
 [Indent Braces No Func]
@@ -2508,7 +2651,7 @@ 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
+TrueFalse=indent_braces_no_func\s*=\s*true|indent_braces_no_func\s*=\s*false
 ValueDefault=false
 
 [Indent Braces No Class]
@@ -2516,7 +2659,7 @@ 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
+TrueFalse=indent_braces_no_class\s*=\s*true|indent_braces_no_class\s*=\s*false
 ValueDefault=false
 
 [Indent Braces No Struct]
@@ -2524,7 +2667,7 @@ 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
+TrueFalse=indent_braces_no_struct\s*=\s*true|indent_braces_no_struct\s*=\s*false
 ValueDefault=false
 
 [Indent Brace Parent]
@@ -2532,7 +2675,7 @@ 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
+TrueFalse=indent_brace_parent\s*=\s*true|indent_brace_parent\s*=\s*false
 ValueDefault=false
 
 [Indent Paren Open Brace]
@@ -2540,7 +2683,7 @@ 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
+TrueFalse=indent_paren_open_brace\s*=\s*true|indent_paren_open_brace\s*=\s*false
 ValueDefault=false
 
 [Indent Cs Delegate Brace]
@@ -2548,7 +2691,7 @@ 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
+TrueFalse=indent_cs_delegate_brace\s*=\s*true|indent_cs_delegate_brace\s*=\s*false
 ValueDefault=false
 
 [Indent Cs Delegate Body]
@@ -2556,7 +2699,7 @@ 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
+TrueFalse=indent_cs_delegate_body\s*=\s*true|indent_cs_delegate_body\s*=\s*false
 ValueDefault=false
 
 [Indent Namespace]
@@ -2564,7 +2707,7 @@ Category=2
 Description="<html>Whether to indent the body of a 'namespace'.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_namespace=true|indent_namespace=false
+TrueFalse=indent_namespace\s*=\s*true|indent_namespace\s*=\s*false
 ValueDefault=false
 
 [Indent Namespace Single Indent]
@@ -2572,7 +2715,7 @@ 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
+TrueFalse=indent_namespace_single_indent\s*=\s*true|indent_namespace_single_indent\s*=\s*false
 ValueDefault=false
 
 [Indent Namespace Level]
@@ -2580,7 +2723,7 @@ 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="
+CallName="indent_namespace_level\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2590,7 +2733,7 @@ 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="
+CallName="indent_namespace_limit\s*=\s*"
 MinVal=0
 MaxVal=255
 ValueDefault=0
@@ -2600,7 +2743,7 @@ Category=2
 Description="<html>Whether to indent only in inner namespaces (nested in other namespaces).<br/>Requires indent_namespace=true.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_namespace_inner_only=true|indent_namespace_inner_only=false
+TrueFalse=indent_namespace_inner_only\s*=\s*true|indent_namespace_inner_only\s*=\s*false
 ValueDefault=false
 
 [Indent Extern]
@@ -2608,7 +2751,7 @@ Category=2
 Description="<html>Whether the 'extern "C"' body is indented.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_extern=true|indent_extern=false
+TrueFalse=indent_extern\s*=\s*true|indent_extern\s*=\s*false
 ValueDefault=false
 
 [Indent Class]
@@ -2616,7 +2759,7 @@ Category=2
 Description="<html>Whether the 'class' body is indented.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_class=true|indent_class=false
+TrueFalse=indent_class\s*=\s*true|indent_class\s*=\s*false
 ValueDefault=false
 
 [Indent Ignore Before Class Colon]
@@ -2624,7 +2767,7 @@ Category=2
 Description="<html>Whether to ignore indent for the leading base class colon.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_ignore_before_class_colon=true|indent_ignore_before_class_colon=false
+TrueFalse=indent_ignore_before_class_colon\s*=\s*true|indent_ignore_before_class_colon\s*=\s*false
 ValueDefault=false
 
 [Indent Before Class Colon]
@@ -2632,7 +2775,7 @@ Category=2
 Description="<html>Additional indent before the leading base class colon.<br/>Negative values decrease indent down to the first column.<br/>Requires indent_ignore_before_class_colon=false and a newline break before<br/>the colon (see pos_class_colon and nl_class_colon)</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_before_class_colon="
+CallName="indent_before_class_colon\s*=\s*"
 MinVal=-16
 MaxVal=16
 ValueDefault=0
@@ -2642,7 +2785,7 @@ 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
+TrueFalse=indent_class_colon\s*=\s*true|indent_class_colon\s*=\s*false
 ValueDefault=false
 
 [Indent Class On Colon]
@@ -2650,7 +2793,7 @@ 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
+TrueFalse=indent_class_on_colon\s*=\s*true|indent_class_on_colon\s*=\s*false
 ValueDefault=false
 
 [Indent Ignore Before Constr Colon]
@@ -2658,7 +2801,7 @@ Category=2
 Description="<html>Whether to ignore indent for a leading class initializer colon.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_ignore_before_constr_colon=true|indent_ignore_before_constr_colon=false
+TrueFalse=indent_ignore_before_constr_colon\s*=\s*true|indent_ignore_before_constr_colon\s*=\s*false
 ValueDefault=false
 
 [Indent Constr Colon]
@@ -2666,7 +2809,7 @@ 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
+TrueFalse=indent_constr_colon\s*=\s*true|indent_constr_colon\s*=\s*false
 ValueDefault=false
 
 [Indent Ctor Init Leading]
@@ -2674,7 +2817,7 @@ Category=2
 Description="<html>Virtual indent from the ':' for leading member initializers.<br/><br/>Default: 2</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_ctor_init_leading="
+CallName="indent_ctor_init_leading\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=2
@@ -2684,7 +2827,7 @@ Category=2
 Description="<html>Virtual indent from the ':' for following member initializers.<br/><br/>Default: 2</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_ctor_init_following="
+CallName="indent_ctor_init_following\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=2
@@ -2694,7 +2837,7 @@ 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="
+CallName="indent_ctor_init\s*=\s*"
 MinVal=-16
 MaxVal=16
 ValueDefault=0
@@ -2704,7 +2847,7 @@ 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
+TrueFalse=indent_else_if\s*=\s*true|indent_else_if\s*=\s*false
 ValueDefault=false
 
 [Indent Var Def Blk]
@@ -2712,7 +2855,7 @@ 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="
+CallName="indent_var_def_blk\s*=\s*"
 MinVal=-16
 MaxVal=16
 ValueDefault=0
@@ -2722,7 +2865,7 @@ 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
+TrueFalse=indent_var_def_cont\s*=\s*true|indent_var_def_cont\s*=\s*false
 ValueDefault=false
 
 [Indent Shift]
@@ -2730,7 +2873,7 @@ Category=2
 Description="<html>How to indent continued shift expressions ('&lt;&lt;' and '&gt;&gt;').<br/>Set align_left_shift=false when using this.<br/> 0: Align shift operators instead of indenting them (default)<br/> 1: Indent by one level<br/>-1: Preserve original indentation</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_shift="
+CallName="indent_shift\s*=\s*"
 MinVal=-1
 MaxVal=1
 ValueDefault=0
@@ -2740,7 +2883,7 @@ 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
+TrueFalse=indent_func_def_force_col1\s*=\s*true|indent_func_def_force_col1\s*=\s*false
 ValueDefault=false
 
 [Indent Func Call Param]
@@ -2748,7 +2891,7 @@ 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
+TrueFalse=indent_func_call_param\s*=\s*true|indent_func_call_param\s*=\s*false
 ValueDefault=false
 
 [Indent Func Def Param]
@@ -2756,7 +2899,7 @@ 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
+TrueFalse=indent_func_def_param\s*=\s*true|indent_func_def_param\s*=\s*false
 ValueDefault=false
 
 [Indent Func Def Param Paren Pos Threshold]
@@ -2764,7 +2907,7 @@ 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="
+CallName="indent_func_def_param_paren_pos_threshold\s*=\s*"
 MinVal=0
 MaxVal=160
 ValueDefault=0
@@ -2774,7 +2917,7 @@ 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
+TrueFalse=indent_func_proto_param\s*=\s*true|indent_func_proto_param\s*=\s*false
 ValueDefault=false
 
 [Indent Func Class Param]
@@ -2782,7 +2925,7 @@ 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
+TrueFalse=indent_func_class_param\s*=\s*true|indent_func_class_param\s*=\s*false
 ValueDefault=false
 
 [Indent Func Ctor Var Param]
@@ -2790,7 +2933,7 @@ 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
+TrueFalse=indent_func_ctor_var_param\s*=\s*true|indent_func_ctor_var_param\s*=\s*false
 ValueDefault=false
 
 [Indent Template Param]
@@ -2798,7 +2941,7 @@ 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
+TrueFalse=indent_template_param\s*=\s*true|indent_template_param\s*=\s*false
 ValueDefault=false
 
 [Indent Func Param Double]
@@ -2806,7 +2949,7 @@ 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
+TrueFalse=indent_func_param_double\s*=\s*true|indent_func_param_double\s*=\s*false
 ValueDefault=false
 
 [Indent Func Const]
@@ -2814,7 +2957,7 @@ Category=2
 Description="<html>Indentation column for standalone 'const' qualifier on a function<br/>prototype.</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_func_const="
+CallName="indent_func_const\s*=\s*"
 MinVal=0
 MaxVal=69
 ValueDefault=0
@@ -2824,7 +2967,7 @@ Category=2
 Description="<html>Indentation column for standalone 'throw' qualifier on a function<br/>prototype.</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_func_throw="
+CallName="indent_func_throw\s*=\s*"
 MinVal=0
 MaxVal=41
 ValueDefault=0
@@ -2834,7 +2977,7 @@ 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
+TrueFalse=indent_macro_brace\s*=\s*true|indent_macro_brace\s*=\s*false
 ValueDefault=true
 
 [Indent Member]
@@ -2842,7 +2985,7 @@ 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="
+CallName="indent_member\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2852,7 +2995,7 @@ 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
+TrueFalse=indent_member_single\s*=\s*true|indent_member_single\s*=\s*false
 ValueDefault=false
 
 [Indent Single Line Comments Before]
@@ -2860,7 +3003,7 @@ Category=2
 Description="<html>Spaces to indent single line ('//') comments on lines before code.</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_single_line_comments_before="
+CallName="indent_single_line_comments_before\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2870,7 +3013,7 @@ Category=2
 Description="<html>Spaces to indent single line ('//') comments on lines after code.</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_single_line_comments_after="
+CallName="indent_single_line_comments_after\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2880,7 +3023,7 @@ 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="
+CallName="indent_sparen_extra\s*=\s*"
 MinVal=-16
 MaxVal=16
 ValueDefault=0
@@ -2890,7 +3033,7 @@ 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
+TrueFalse=indent_relative_single_line_comments\s*=\s*true|indent_relative_single_line_comments\s*=\s*false
 ValueDefault=false
 
 [Indent Switch Case]
@@ -2898,7 +3041,7 @@ Category=2
 Description="<html>Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.<br/>It might be wise to choose the same value for the option indent_case_brace.</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_switch_case="
+CallName="indent_switch_case\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2908,7 +3051,7 @@ Category=2
 Description="<html>Spaces to indent the body of a 'switch' before any 'case'.<br/>Usually the same as indent_columns or indent_switch_case.</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_switch_body="
+CallName="indent_switch_body\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2918,7 +3061,7 @@ Category=2
 Description="<html>Whether to ignore indent for '{' following 'case'.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_ignore_case_brace=true|indent_ignore_case_brace=false
+TrueFalse=indent_ignore_case_brace\s*=\s*true|indent_ignore_case_brace\s*=\s*false
 ValueDefault=false
 
 [Indent Case Brace]
@@ -2926,7 +3069,7 @@ 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 be wise to choose the same value for the option indent_switch_case.</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_case_brace="
+CallName="indent_case_brace\s*=\s*"
 MinVal=-16
 MaxVal=16
 ValueDefault=0
@@ -2936,7 +3079,7 @@ 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
+TrueFalse=indent_switch_break_with_case\s*=\s*true|indent_switch_break_with_case\s*=\s*false
 ValueDefault=false
 
 [Indent Switch Pp]
@@ -2944,7 +3087,7 @@ 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
+TrueFalse=indent_switch_pp\s*=\s*true|indent_switch_pp\s*=\s*false
 ValueDefault=true
 
 [Indent Case Shift]
@@ -2952,7 +3095,7 @@ 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="
+CallName="indent_case_shift\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2962,7 +3105,7 @@ Category=2
 Description="<html>Whether to align comments before 'case' with the 'case'.<br/><br/>Default: true</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_case_comment=true|indent_case_comment=false
+TrueFalse=indent_case_comment\s*=\s*true|indent_case_comment\s*=\s*false
 ValueDefault=true
 
 [Indent Comment]
@@ -2970,7 +3113,7 @@ Category=2
 Description="<html>Whether to indent comments not found in first column.<br/><br/>Default: true</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_comment=true|indent_comment=false
+TrueFalse=indent_comment\s*=\s*true|indent_comment\s*=\s*false
 ValueDefault=true
 
 [Indent Col1 Comment]
@@ -2978,7 +3121,7 @@ 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
+TrueFalse=indent_col1_comment\s*=\s*true|indent_col1_comment\s*=\s*false
 ValueDefault=false
 
 [Indent Col1 Multi String Literal]
@@ -2986,7 +3129,7 @@ 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
+TrueFalse=indent_col1_multi_string_literal\s*=\s*true|indent_col1_multi_string_literal\s*=\s*false
 ValueDefault=false
 
 [Indent Comment Align Thresh]
@@ -2994,7 +3137,7 @@ Category=2
 Description="<html>Align comments on adjacent lines that are this many columns apart or less.<br/><br/>Default: 3</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_comment_align_thresh="
+CallName="indent_comment_align_thresh\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=3
@@ -3004,7 +3147,7 @@ Category=2
 Description="<html>Whether to ignore indent for goto labels.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_ignore_label=true|indent_ignore_label=false
+TrueFalse=indent_ignore_label\s*=\s*true|indent_ignore_label\s*=\s*false
 ValueDefault=false
 
 [Indent Label]
@@ -3012,7 +3155,7 @@ Category=2
 Description="<html>How to indent goto labels. Requires indent_ignore_label=false.<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="
+CallName="indent_label\s*=\s*"
 MinVal=-16
 MaxVal=16
 ValueDefault=1
@@ -3022,7 +3165,7 @@ 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="
+CallName="indent_access_spec\s*=\s*"
 MinVal=-16
 MaxVal=16
 ValueDefault=1
@@ -3032,7 +3175,7 @@ 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
+TrueFalse=indent_access_spec_body\s*=\s*true|indent_access_spec_body\s*=\s*false
 ValueDefault=false
 
 [Indent Paren Nl]
@@ -3040,7 +3183,7 @@ 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
+TrueFalse=indent_paren_nl\s*=\s*true|indent_paren_nl\s*=\s*false
 ValueDefault=false
 
 [Indent Paren Close]
@@ -3048,7 +3191,7 @@ 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<br/>-1: Preserve original indentation</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_paren_close="
+CallName="indent_paren_close\s*=\s*"
 MinVal=-1
 MaxVal=2
 ValueDefault=0
@@ -3058,7 +3201,7 @@ 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
+TrueFalse=indent_paren_after_func_def\s*=\s*true|indent_paren_after_func_def\s*=\s*false
 ValueDefault=false
 
 [Indent Paren After Func Decl]
@@ -3066,7 +3209,7 @@ 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
+TrueFalse=indent_paren_after_func_decl\s*=\s*true|indent_paren_after_func_decl\s*=\s*false
 ValueDefault=false
 
 [Indent Paren After Func Call]
@@ -3074,7 +3217,7 @@ 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
+TrueFalse=indent_paren_after_func_call\s*=\s*true|indent_paren_after_func_call\s*=\s*false
 ValueDefault=false
 
 [Indent Comma Brace]
@@ -3082,7 +3225,7 @@ Category=2
 Description="<html>How to indent a comma when inside braces.<br/> 0: Indent by one level (default)<br/> 1: Align under the open brace<br/>-1: Preserve original indentation</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_comma_brace="
+CallName="indent_comma_brace\s*=\s*"
 MinVal=-1
 MaxVal=1
 ValueDefault=0
@@ -3092,7 +3235,7 @@ Category=2
 Description="<html>How to indent a comma when inside parentheses.<br/> 0: Indent by one level (default)<br/> 1: Align under the open parenthesis<br/>-1: Preserve original indentation</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_comma_paren="
+CallName="indent_comma_paren\s*=\s*"
 MinVal=-1
 MaxVal=1
 ValueDefault=0
@@ -3102,7 +3245,7 @@ Category=2
 Description="<html>How to indent a Boolean operator when inside parentheses.<br/> 0: Indent by one level (default)<br/> 1: Align under the open parenthesis<br/>-1: Preserve original indentation</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_bool_paren="
+CallName="indent_bool_paren\s*=\s*"
 MinVal=-1
 MaxVal=1
 ValueDefault=0
@@ -3112,7 +3255,7 @@ Category=2
 Description="<html>Whether to ignore the indentation of a Boolean operator when outside<br/>parentheses.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_ignore_bool=true|indent_ignore_bool=false
+TrueFalse=indent_ignore_bool\s*=\s*true|indent_ignore_bool\s*=\s*false
 ValueDefault=false
 
 [Indent Ignore Arith]
@@ -3120,7 +3263,7 @@ Category=2
 Description="<html>Whether to ignore the indentation of an arithmetic operator.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_ignore_arith=true|indent_ignore_arith=false
+TrueFalse=indent_ignore_arith\s*=\s*true|indent_ignore_arith\s*=\s*false
 ValueDefault=false
 
 [Indent Semicolon For Paren]
@@ -3128,7 +3271,7 @@ 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
+TrueFalse=indent_semicolon_for_paren\s*=\s*true|indent_semicolon_for_paren\s*=\s*false
 ValueDefault=false
 
 [Indent Ignore Semicolon]
@@ -3136,7 +3279,7 @@ Category=2
 Description="<html>Whether to ignore the indentation of a semicolon outside of a 'for'<br/>statement.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_ignore_semicolon=true|indent_ignore_semicolon=false
+TrueFalse=indent_ignore_semicolon\s*=\s*true|indent_ignore_semicolon\s*=\s*false
 ValueDefault=false
 
 [Indent First Bool Expr]
@@ -3144,7 +3287,7 @@ Category=2
 Description="<html>Whether to align the first expression to following ones<br/>if indent_bool_paren=1.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_first_bool_expr=true|indent_first_bool_expr=false
+TrueFalse=indent_first_bool_expr\s*=\s*true|indent_first_bool_expr\s*=\s*false
 ValueDefault=false
 
 [Indent First For Expr]
@@ -3152,7 +3295,7 @@ 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
+TrueFalse=indent_first_for_expr\s*=\s*true|indent_first_for_expr\s*=\s*false
 ValueDefault=false
 
 [Indent Square Nl]
@@ -3160,7 +3303,7 @@ 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
+TrueFalse=indent_square_nl\s*=\s*true|indent_square_nl\s*=\s*false
 ValueDefault=false
 
 [Indent Preserve Sql]
@@ -3168,7 +3311,7 @@ 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
+TrueFalse=indent_preserve_sql\s*=\s*true|indent_preserve_sql\s*=\s*false
 ValueDefault=false
 
 [Indent Ignore Assign]
@@ -3176,7 +3319,7 @@ Category=2
 Description="<html>Whether to ignore the indentation of an assignment operator.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_ignore_assign=true|indent_ignore_assign=false
+TrueFalse=indent_ignore_assign\s*=\s*true|indent_ignore_assign\s*=\s*false
 ValueDefault=false
 
 [Indent Align Assign]
@@ -3184,7 +3327,7 @@ 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
+TrueFalse=indent_align_assign\s*=\s*true|indent_align_assign\s*=\s*false
 ValueDefault=true
 
 [Indent Off After Assign]
@@ -3192,7 +3335,7 @@ 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
+TrueFalse=indent_off_after_assign\s*=\s*true|indent_off_after_assign\s*=\s*false
 ValueDefault=false
 
 [Indent Align Paren]
@@ -3200,7 +3343,7 @@ 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
+TrueFalse=indent_align_paren\s*=\s*true|indent_align_paren\s*=\s*false
 ValueDefault=true
 
 [Indent Oc Inside Msg Sel]
@@ -3208,7 +3351,7 @@ 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
+TrueFalse=indent_oc_inside_msg_sel\s*=\s*true|indent_oc_inside_msg_sel\s*=\s*false
 ValueDefault=false
 
 [Indent Oc Block]
@@ -3216,7 +3359,7 @@ 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
+TrueFalse=indent_oc_block\s*=\s*true|indent_oc_block\s*=\s*false
 ValueDefault=false
 
 [Indent Oc Block Msg]
@@ -3224,7 +3367,7 @@ 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="
+CallName="indent_oc_block_msg\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -3234,7 +3377,7 @@ Category=2
 Description="<html>(OC) Minimum indent for subsequent parameters</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_oc_msg_colon="
+CallName="indent_oc_msg_colon\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -3244,7 +3387,7 @@ 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
+TrueFalse=indent_oc_msg_prioritize_first_colon\s*=\s*true|indent_oc_msg_prioritize_first_colon\s*=\s*false
 ValueDefault=true
 
 [Indent Oc Block Msg Xcode Style]
@@ -3252,7 +3395,7 @@ 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
+TrueFalse=indent_oc_block_msg_xcode_style\s*=\s*true|indent_oc_block_msg_xcode_style\s*=\s*false
 ValueDefault=false
 
 [Indent Oc Block Msg From Keyword]
@@ -3260,7 +3403,7 @@ 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
+TrueFalse=indent_oc_block_msg_from_keyword\s*=\s*true|indent_oc_block_msg_from_keyword\s*=\s*false
 ValueDefault=false
 
 [Indent Oc Block Msg From Colon]
@@ -3268,7 +3411,7 @@ 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
+TrueFalse=indent_oc_block_msg_from_colon\s*=\s*true|indent_oc_block_msg_from_colon\s*=\s*false
 ValueDefault=false
 
 [Indent Oc Block Msg From Caret]
@@ -3276,7 +3419,7 @@ 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
+TrueFalse=indent_oc_block_msg_from_caret\s*=\s*true|indent_oc_block_msg_from_caret\s*=\s*false
 ValueDefault=false
 
 [Indent Oc Block Msg From Brace]
@@ -3284,7 +3427,7 @@ 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
+TrueFalse=indent_oc_block_msg_from_brace\s*=\s*true|indent_oc_block_msg_from_brace\s*=\s*false
 ValueDefault=false
 
 [Indent Min Vbrace Open]
@@ -3292,7 +3435,7 @@ 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="
+CallName="indent_min_vbrace_open\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -3302,7 +3445,7 @@ 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
+TrueFalse=indent_vbrace_open_on_tabstop\s*=\s*true|indent_vbrace_open_on_tabstop\s*=\s*false
 ValueDefault=false
 
 [Indent Token After Brace]
@@ -3310,7 +3453,7 @@ 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
+TrueFalse=indent_token_after_brace\s*=\s*true|indent_token_after_brace\s*=\s*false
 ValueDefault=true
 
 [Indent Cpp Lambda Body]
@@ -3318,7 +3461,7 @@ 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
+TrueFalse=indent_cpp_lambda_body\s*=\s*true|indent_cpp_lambda_body\s*=\s*false
 ValueDefault=false
 
 [Indent Compound Literal Return]
@@ -3326,7 +3469,7 @@ 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
+TrueFalse=indent_compound_literal_return\s*=\s*true|indent_compound_literal_return\s*=\s*false
 ValueDefault=true
 
 [Indent Using Block]
@@ -3334,7 +3477,7 @@ 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
+TrueFalse=indent_using_block\s*=\s*true|indent_using_block\s*=\s*false
 ValueDefault=true
 
 [Indent Ternary Operator]
@@ -3342,7 +3485,7 @@ 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 the `if_true` branch<br/>2: When the `:` is a continuation, indent it under `?`</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_ternary_operator="
+CallName="indent_ternary_operator\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -3352,7 +3495,7 @@ 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
+TrueFalse=indent_inside_ternary_operator\s*=\s*true|indent_inside_ternary_operator\s*=\s*false
 ValueDefault=false
 
 [Indent Off After Return]
@@ -3360,7 +3503,7 @@ 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
+TrueFalse=indent_off_after_return\s*=\s*true|indent_off_after_return\s*=\s*false
 ValueDefault=false
 
 [Indent Off After Return New]
@@ -3368,7 +3511,7 @@ 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
+TrueFalse=indent_off_after_return_new\s*=\s*true|indent_off_after_return_new\s*=\s*false
 ValueDefault=false
 
 [Indent Single After Return]
@@ -3376,7 +3519,7 @@ 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
+TrueFalse=indent_single_after_return\s*=\s*true|indent_single_after_return\s*=\s*false
 ValueDefault=false
 
 [Indent Ignore Asm Block]
@@ -3384,7 +3527,7 @@ 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
+TrueFalse=indent_ignore_asm_block\s*=\s*true|indent_ignore_asm_block\s*=\s*false
 ValueDefault=false
 
 [Donot Indent Func Def Close Paren]
@@ -3392,7 +3535,7 @@ 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
+TrueFalse=donot_indent_func_def_close_paren\s*=\s*true|donot_indent_func_def_close_paren\s*=\s*false
 ValueDefault=false
 
 [Nl Collapse Empty Body]
@@ -3400,7 +3543,7 @@ Category=3
 Description="<html>Whether to collapse empty blocks between '{' and '}' except for functions.<br/>Use nl_collapse_empty_body_functions to specify how empty function braces<br/>should be formatted.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=nl_collapse_empty_body=true|nl_collapse_empty_body=false
+TrueFalse=nl_collapse_empty_body\s*=\s*true|nl_collapse_empty_body\s*=\s*false
 ValueDefault=false
 
 [Nl Collapse Empty Body Functions]
@@ -3408,7 +3551,7 @@ Category=3
 Description="<html>Whether to collapse empty blocks between '{' and '}' for functions only.<br/>If true, overrides nl_inside_empty_func.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=nl_collapse_empty_body_functions=true|nl_collapse_empty_body_functions=false
+TrueFalse=nl_collapse_empty_body_functions\s*=\s*true|nl_collapse_empty_body_functions\s*=\s*false
 ValueDefault=false
 
 [Nl Assign Leave One Liners]
@@ -3416,7 +3559,7 @@ 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
+TrueFalse=nl_assign_leave_one_liners\s*=\s*true|nl_assign_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl Class Leave One Liners]
@@ -3424,7 +3567,7 @@ 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
+TrueFalse=nl_class_leave_one_liners\s*=\s*true|nl_class_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl Enum Leave One Liners]
@@ -3432,7 +3575,7 @@ 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
+TrueFalse=nl_enum_leave_one_liners\s*=\s*true|nl_enum_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl Getset Leave One Liners]
@@ -3440,7 +3583,7 @@ 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
+TrueFalse=nl_getset_leave_one_liners\s*=\s*true|nl_getset_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl Cs Property Leave One Liners]
@@ -3448,7 +3591,7 @@ 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
+TrueFalse=nl_cs_property_leave_one_liners\s*=\s*true|nl_cs_property_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl Func Leave One Liners]
@@ -3456,7 +3599,7 @@ 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
+TrueFalse=nl_func_leave_one_liners\s*=\s*true|nl_func_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl Cpp Lambda Leave One Liners]
@@ -3464,7 +3607,7 @@ 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
+TrueFalse=nl_cpp_lambda_leave_one_liners\s*=\s*true|nl_cpp_lambda_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl If Leave One Liners]
@@ -3472,7 +3615,7 @@ 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
+TrueFalse=nl_if_leave_one_liners\s*=\s*true|nl_if_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl While Leave One Liners]
@@ -3480,7 +3623,7 @@ 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
+TrueFalse=nl_while_leave_one_liners\s*=\s*true|nl_while_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl Do Leave One Liners]
@@ -3488,7 +3631,7 @@ 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
+TrueFalse=nl_do_leave_one_liners\s*=\s*true|nl_do_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl For Leave One Liners]
@@ -3496,7 +3639,7 @@ 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
+TrueFalse=nl_for_leave_one_liners\s*=\s*true|nl_for_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl Oc Msg Leave One Liner]
@@ -3504,7 +3647,7 @@ 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
+TrueFalse=nl_oc_msg_leave_one_liner\s*=\s*true|nl_oc_msg_leave_one_liner\s*=\s*false
 ValueDefault=false
 
 [Nl Oc Mdef Brace]
@@ -3512,7 +3655,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|nl_oc_mdef_brace=not_defined
+Choices=nl_oc_mdef_brace\s*=\s*ignore|nl_oc_mdef_brace\s*=\s*add|nl_oc_mdef_brace\s*=\s*remove|nl_oc_mdef_brace\s*=\s*force|nl_oc_mdef_brace\s*=\s*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
 
@@ -3521,7 +3664,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|nl_oc_block_brace=not_defined
+Choices=nl_oc_block_brace\s*=\s*ignore|nl_oc_block_brace\s*=\s*add|nl_oc_block_brace\s*=\s*remove|nl_oc_block_brace\s*=\s*force|nl_oc_block_brace\s*=\s*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
 
@@ -3530,7 +3673,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|nl_oc_before_interface=not_defined
+Choices=nl_oc_before_interface\s*=\s*ignore|nl_oc_before_interface\s*=\s*add|nl_oc_before_interface\s*=\s*remove|nl_oc_before_interface\s*=\s*force|nl_oc_before_interface\s*=\s*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
 
@@ -3539,7 +3682,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|nl_oc_before_implementation=not_defined
+Choices=nl_oc_before_implementation\s*=\s*ignore|nl_oc_before_implementation\s*=\s*add|nl_oc_before_implementation\s*=\s*remove|nl_oc_before_implementation\s*=\s*force|nl_oc_before_implementation\s*=\s*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
 
@@ -3548,7 +3691,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|nl_oc_before_end=not_defined
+Choices=nl_oc_before_end\s*=\s*ignore|nl_oc_before_end\s*=\s*add|nl_oc_before_end\s*=\s*remove|nl_oc_before_end\s*=\s*force|nl_oc_before_end\s*=\s*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
 
@@ -3557,7 +3700,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|nl_oc_interface_brace=not_defined
+Choices=nl_oc_interface_brace\s*=\s*ignore|nl_oc_interface_brace\s*=\s*add|nl_oc_interface_brace\s*=\s*remove|nl_oc_interface_brace\s*=\s*force|nl_oc_interface_brace\s*=\s*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
 
@@ -3566,7 +3709,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|nl_oc_implementation_brace=not_defined
+Choices=nl_oc_implementation_brace\s*=\s*ignore|nl_oc_implementation_brace\s*=\s*add|nl_oc_implementation_brace\s*=\s*remove|nl_oc_implementation_brace\s*=\s*force|nl_oc_implementation_brace\s*=\s*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
 
@@ -3575,7 +3718,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|nl_start_of_file=not_defined
+Choices=nl_start_of_file\s*=\s*ignore|nl_start_of_file\s*=\s*add|nl_start_of_file\s*=\s*remove|nl_start_of_file\s*=\s*force|nl_start_of_file\s*=\s*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
 
@@ -3584,7 +3727,7 @@ 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="
+CallName="nl_start_of_file_min\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -3594,7 +3737,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|nl_end_of_file=not_defined
+Choices=nl_end_of_file\s*=\s*ignore|nl_end_of_file\s*=\s*add|nl_end_of_file\s*=\s*remove|nl_end_of_file\s*=\s*force|nl_end_of_file\s*=\s*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
 
@@ -3603,7 +3746,7 @@ 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="
+CallName="nl_end_of_file_min\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -3613,7 +3756,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|nl_assign_brace=not_defined
+Choices=nl_assign_brace\s*=\s*ignore|nl_assign_brace\s*=\s*add|nl_assign_brace\s*=\s*remove|nl_assign_brace\s*=\s*force|nl_assign_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Assign Brace|Add Nl Assign Brace|Remove Nl Assign Brace|Force Nl Assign Brace"
 ValueDefault=ignore
 
@@ -3622,7 +3765,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|nl_assign_square=not_defined
+Choices=nl_assign_square\s*=\s*ignore|nl_assign_square\s*=\s*add|nl_assign_square\s*=\s*remove|nl_assign_square\s*=\s*force|nl_assign_square\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Assign Square|Add Nl Assign Square|Remove Nl Assign Square|Force Nl Assign Square"
 ValueDefault=ignore
 
@@ -3631,7 +3774,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|nl_tsquare_brace=not_defined
+Choices=nl_tsquare_brace\s*=\s*ignore|nl_tsquare_brace\s*=\s*add|nl_tsquare_brace\s*=\s*remove|nl_tsquare_brace\s*=\s*force|nl_tsquare_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Tsquare Brace|Add Nl Tsquare Brace|Remove Nl Tsquare Brace|Force Nl Tsquare Brace"
 ValueDefault=ignore
 
@@ -3640,7 +3783,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|nl_after_square_assign=not_defined
+Choices=nl_after_square_assign\s*=\s*ignore|nl_after_square_assign\s*=\s*add|nl_after_square_assign\s*=\s*remove|nl_after_square_assign\s*=\s*force|nl_after_square_assign\s*=\s*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
 
@@ -3649,7 +3792,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|nl_fcall_brace=not_defined
+Choices=nl_fcall_brace\s*=\s*ignore|nl_fcall_brace\s*=\s*add|nl_fcall_brace\s*=\s*remove|nl_fcall_brace\s*=\s*force|nl_fcall_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Fcall Brace|Add Nl Fcall Brace|Remove Nl Fcall Brace|Force Nl Fcall Brace"
 ValueDefault=ignore
 
@@ -3658,7 +3801,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|nl_enum_brace=not_defined
+Choices=nl_enum_brace\s*=\s*ignore|nl_enum_brace\s*=\s*add|nl_enum_brace\s*=\s*remove|nl_enum_brace\s*=\s*force|nl_enum_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Enum Brace|Add Nl Enum Brace|Remove Nl Enum Brace|Force Nl Enum Brace"
 ValueDefault=ignore
 
@@ -3667,7 +3810,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|nl_enum_class=not_defined
+Choices=nl_enum_class\s*=\s*ignore|nl_enum_class\s*=\s*add|nl_enum_class\s*=\s*remove|nl_enum_class\s*=\s*force|nl_enum_class\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Enum Class|Add Nl Enum Class|Remove Nl Enum Class|Force Nl Enum Class"
 ValueDefault=ignore
 
@@ -3676,7 +3819,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|nl_enum_class_identifier=not_defined
+Choices=nl_enum_class_identifier\s*=\s*ignore|nl_enum_class_identifier\s*=\s*add|nl_enum_class_identifier\s*=\s*remove|nl_enum_class_identifier\s*=\s*force|nl_enum_class_identifier\s*=\s*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
 
@@ -3685,7 +3828,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|nl_enum_identifier_colon=not_defined
+Choices=nl_enum_identifier_colon\s*=\s*ignore|nl_enum_identifier_colon\s*=\s*add|nl_enum_identifier_colon\s*=\s*remove|nl_enum_identifier_colon\s*=\s*force|nl_enum_identifier_colon\s*=\s*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
 
@@ -3694,7 +3837,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|nl_enum_colon_type=not_defined
+Choices=nl_enum_colon_type\s*=\s*ignore|nl_enum_colon_type\s*=\s*add|nl_enum_colon_type\s*=\s*remove|nl_enum_colon_type\s*=\s*force|nl_enum_colon_type\s*=\s*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
 
@@ -3703,7 +3846,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|nl_struct_brace=not_defined
+Choices=nl_struct_brace\s*=\s*ignore|nl_struct_brace\s*=\s*add|nl_struct_brace\s*=\s*remove|nl_struct_brace\s*=\s*force|nl_struct_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Struct Brace|Add Nl Struct Brace|Remove Nl Struct Brace|Force Nl Struct Brace"
 ValueDefault=ignore
 
@@ -3712,7 +3855,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|nl_union_brace=not_defined
+Choices=nl_union_brace\s*=\s*ignore|nl_union_brace\s*=\s*add|nl_union_brace\s*=\s*remove|nl_union_brace\s*=\s*force|nl_union_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Union Brace|Add Nl Union Brace|Remove Nl Union Brace|Force Nl Union Brace"
 ValueDefault=ignore
 
@@ -3721,7 +3864,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|nl_if_brace=not_defined
+Choices=nl_if_brace\s*=\s*ignore|nl_if_brace\s*=\s*add|nl_if_brace\s*=\s*remove|nl_if_brace\s*=\s*force|nl_if_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl If Brace|Add Nl If Brace|Remove Nl If Brace|Force Nl If Brace"
 ValueDefault=ignore
 
@@ -3730,7 +3873,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|nl_brace_else=not_defined
+Choices=nl_brace_else\s*=\s*ignore|nl_brace_else\s*=\s*add|nl_brace_else\s*=\s*remove|nl_brace_else\s*=\s*force|nl_brace_else\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Brace Else|Add Nl Brace Else|Remove Nl Brace Else|Force Nl Brace Else"
 ValueDefault=ignore
 
@@ -3739,7 +3882,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|nl_elseif_brace=not_defined
+Choices=nl_elseif_brace\s*=\s*ignore|nl_elseif_brace\s*=\s*add|nl_elseif_brace\s*=\s*remove|nl_elseif_brace\s*=\s*force|nl_elseif_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Elseif Brace|Add Nl Elseif Brace|Remove Nl Elseif Brace|Force Nl Elseif Brace"
 ValueDefault=ignore
 
@@ -3748,7 +3891,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|nl_else_brace=not_defined
+Choices=nl_else_brace\s*=\s*ignore|nl_else_brace\s*=\s*add|nl_else_brace\s*=\s*remove|nl_else_brace\s*=\s*force|nl_else_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Else Brace|Add Nl Else Brace|Remove Nl Else Brace|Force Nl Else Brace"
 ValueDefault=ignore
 
@@ -3757,7 +3900,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|nl_else_if=not_defined
+Choices=nl_else_if\s*=\s*ignore|nl_else_if\s*=\s*add|nl_else_if\s*=\s*remove|nl_else_if\s*=\s*force|nl_else_if\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Else If|Add Nl Else If|Remove Nl Else If|Force Nl Else If"
 ValueDefault=ignore
 
@@ -3766,7 +3909,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|nl_before_opening_brace_func_class_def=not_defined
+Choices=nl_before_opening_brace_func_class_def\s*=\s*ignore|nl_before_opening_brace_func_class_def\s*=\s*add|nl_before_opening_brace_func_class_def\s*=\s*remove|nl_before_opening_brace_func_class_def\s*=\s*force|nl_before_opening_brace_func_class_def\s*=\s*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
 
@@ -3775,7 +3918,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|nl_before_if_closing_paren=not_defined
+Choices=nl_before_if_closing_paren\s*=\s*ignore|nl_before_if_closing_paren\s*=\s*add|nl_before_if_closing_paren\s*=\s*remove|nl_before_if_closing_paren\s*=\s*force|nl_before_if_closing_paren\s*=\s*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
 
@@ -3784,7 +3927,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|nl_brace_finally=not_defined
+Choices=nl_brace_finally\s*=\s*ignore|nl_brace_finally\s*=\s*add|nl_brace_finally\s*=\s*remove|nl_brace_finally\s*=\s*force|nl_brace_finally\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Brace Finally|Add Nl Brace Finally|Remove Nl Brace Finally|Force Nl Brace Finally"
 ValueDefault=ignore
 
@@ -3793,7 +3936,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|nl_finally_brace=not_defined
+Choices=nl_finally_brace\s*=\s*ignore|nl_finally_brace\s*=\s*add|nl_finally_brace\s*=\s*remove|nl_finally_brace\s*=\s*force|nl_finally_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Finally Brace|Add Nl Finally Brace|Remove Nl Finally Brace|Force Nl Finally Brace"
 ValueDefault=ignore
 
@@ -3802,7 +3945,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|nl_try_brace=not_defined
+Choices=nl_try_brace\s*=\s*ignore|nl_try_brace\s*=\s*add|nl_try_brace\s*=\s*remove|nl_try_brace\s*=\s*force|nl_try_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Try Brace|Add Nl Try Brace|Remove Nl Try Brace|Force Nl Try Brace"
 ValueDefault=ignore
 
@@ -3811,7 +3954,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|nl_getset_brace=not_defined
+Choices=nl_getset_brace\s*=\s*ignore|nl_getset_brace\s*=\s*add|nl_getset_brace\s*=\s*remove|nl_getset_brace\s*=\s*force|nl_getset_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Getset Brace|Add Nl Getset Brace|Remove Nl Getset Brace|Force Nl Getset Brace"
 ValueDefault=ignore
 
@@ -3820,7 +3963,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|nl_for_brace=not_defined
+Choices=nl_for_brace\s*=\s*ignore|nl_for_brace\s*=\s*add|nl_for_brace\s*=\s*remove|nl_for_brace\s*=\s*force|nl_for_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl For Brace|Add Nl For Brace|Remove Nl For Brace|Force Nl For Brace"
 ValueDefault=ignore
 
@@ -3829,7 +3972,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|nl_catch_brace=not_defined
+Choices=nl_catch_brace\s*=\s*ignore|nl_catch_brace\s*=\s*add|nl_catch_brace\s*=\s*remove|nl_catch_brace\s*=\s*force|nl_catch_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Catch Brace|Add Nl Catch Brace|Remove Nl Catch Brace|Force Nl Catch Brace"
 ValueDefault=ignore
 
@@ -3838,7 +3981,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|nl_oc_catch_brace=not_defined
+Choices=nl_oc_catch_brace\s*=\s*ignore|nl_oc_catch_brace\s*=\s*add|nl_oc_catch_brace\s*=\s*remove|nl_oc_catch_brace\s*=\s*force|nl_oc_catch_brace\s*=\s*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
 
@@ -3847,7 +3990,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|nl_brace_catch=not_defined
+Choices=nl_brace_catch\s*=\s*ignore|nl_brace_catch\s*=\s*add|nl_brace_catch\s*=\s*remove|nl_brace_catch\s*=\s*force|nl_brace_catch\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Brace Catch|Add Nl Brace Catch|Remove Nl Brace Catch|Force Nl Brace Catch"
 ValueDefault=ignore
 
@@ -3856,7 +3999,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|nl_oc_brace_catch=not_defined
+Choices=nl_oc_brace_catch\s*=\s*ignore|nl_oc_brace_catch\s*=\s*add|nl_oc_brace_catch\s*=\s*remove|nl_oc_brace_catch\s*=\s*force|nl_oc_brace_catch\s*=\s*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
 
@@ -3865,7 +4008,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|nl_brace_square=not_defined
+Choices=nl_brace_square\s*=\s*ignore|nl_brace_square\s*=\s*add|nl_brace_square\s*=\s*remove|nl_brace_square\s*=\s*force|nl_brace_square\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Brace Square|Add Nl Brace Square|Remove Nl Brace Square|Force Nl Brace Square"
 ValueDefault=ignore
 
@@ -3874,7 +4017,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|nl_brace_fparen=not_defined
+Choices=nl_brace_fparen\s*=\s*ignore|nl_brace_fparen\s*=\s*add|nl_brace_fparen\s*=\s*remove|nl_brace_fparen\s*=\s*force|nl_brace_fparen\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Brace Fparen|Add Nl Brace Fparen|Remove Nl Brace Fparen|Force Nl Brace Fparen"
 ValueDefault=ignore
 
@@ -3883,7 +4026,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|nl_while_brace=not_defined
+Choices=nl_while_brace\s*=\s*ignore|nl_while_brace\s*=\s*add|nl_while_brace\s*=\s*remove|nl_while_brace\s*=\s*force|nl_while_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl While Brace|Add Nl While Brace|Remove Nl While Brace|Force Nl While Brace"
 ValueDefault=ignore
 
@@ -3892,7 +4035,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|nl_scope_brace=not_defined
+Choices=nl_scope_brace\s*=\s*ignore|nl_scope_brace\s*=\s*add|nl_scope_brace\s*=\s*remove|nl_scope_brace\s*=\s*force|nl_scope_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Scope Brace|Add Nl Scope Brace|Remove Nl Scope Brace|Force Nl Scope Brace"
 ValueDefault=ignore
 
@@ -3901,7 +4044,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|nl_unittest_brace=not_defined
+Choices=nl_unittest_brace\s*=\s*ignore|nl_unittest_brace\s*=\s*add|nl_unittest_brace\s*=\s*remove|nl_unittest_brace\s*=\s*force|nl_unittest_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Unittest Brace|Add Nl Unittest Brace|Remove Nl Unittest Brace|Force Nl Unittest Brace"
 ValueDefault=ignore
 
@@ -3910,7 +4053,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|nl_version_brace=not_defined
+Choices=nl_version_brace\s*=\s*ignore|nl_version_brace\s*=\s*add|nl_version_brace\s*=\s*remove|nl_version_brace\s*=\s*force|nl_version_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Version Brace|Add Nl Version Brace|Remove Nl Version Brace|Force Nl Version Brace"
 ValueDefault=ignore
 
@@ -3919,7 +4062,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|nl_using_brace=not_defined
+Choices=nl_using_brace\s*=\s*ignore|nl_using_brace\s*=\s*add|nl_using_brace\s*=\s*remove|nl_using_brace\s*=\s*force|nl_using_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Using Brace|Add Nl Using Brace|Remove Nl Using Brace|Force Nl Using Brace"
 ValueDefault=ignore
 
@@ -3928,7 +4071,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|nl_brace_brace=not_defined
+Choices=nl_brace_brace\s*=\s*ignore|nl_brace_brace\s*=\s*add|nl_brace_brace\s*=\s*remove|nl_brace_brace\s*=\s*force|nl_brace_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Brace Brace|Add Nl Brace Brace|Remove Nl Brace Brace|Force Nl Brace Brace"
 ValueDefault=ignore
 
@@ -3937,7 +4080,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|nl_do_brace=not_defined
+Choices=nl_do_brace\s*=\s*ignore|nl_do_brace\s*=\s*add|nl_do_brace\s*=\s*remove|nl_do_brace\s*=\s*force|nl_do_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Do Brace|Add Nl Do Brace|Remove Nl Do Brace|Force Nl Do Brace"
 ValueDefault=ignore
 
@@ -3946,7 +4089,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|nl_brace_while=not_defined
+Choices=nl_brace_while\s*=\s*ignore|nl_brace_while\s*=\s*add|nl_brace_while\s*=\s*remove|nl_brace_while\s*=\s*force|nl_brace_while\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Brace While|Add Nl Brace While|Remove Nl Brace While|Force Nl Brace While"
 ValueDefault=ignore
 
@@ -3955,7 +4098,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|nl_switch_brace=not_defined
+Choices=nl_switch_brace\s*=\s*ignore|nl_switch_brace\s*=\s*add|nl_switch_brace\s*=\s*remove|nl_switch_brace\s*=\s*force|nl_switch_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Switch Brace|Add Nl Switch Brace|Remove Nl Switch Brace|Force Nl Switch Brace"
 ValueDefault=ignore
 
@@ -3964,7 +4107,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|nl_synchronized_brace=not_defined
+Choices=nl_synchronized_brace\s*=\s*ignore|nl_synchronized_brace\s*=\s*add|nl_synchronized_brace\s*=\s*remove|nl_synchronized_brace\s*=\s*force|nl_synchronized_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Synchronized Brace|Add Nl Synchronized Brace|Remove Nl Synchronized Brace|Force Nl Synchronized Brace"
 ValueDefault=ignore
 
@@ -3973,7 +4116,7 @@ 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
+TrueFalse=nl_multi_line_cond\s*=\s*true|nl_multi_line_cond\s*=\s*false
 ValueDefault=false
 
 [Nl Multi Line Sparen Open]
@@ -3981,7 +4124,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|nl_multi_line_sparen_open=not_defined
+Choices=nl_multi_line_sparen_open\s*=\s*ignore|nl_multi_line_sparen_open\s*=\s*add|nl_multi_line_sparen_open\s*=\s*remove|nl_multi_line_sparen_open\s*=\s*force|nl_multi_line_sparen_open\s*=\s*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
 
@@ -3990,7 +4133,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|nl_multi_line_sparen_close=not_defined
+Choices=nl_multi_line_sparen_close\s*=\s*ignore|nl_multi_line_sparen_close\s*=\s*add|nl_multi_line_sparen_close\s*=\s*remove|nl_multi_line_sparen_close\s*=\s*force|nl_multi_line_sparen_close\s*=\s*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
 
@@ -3999,7 +4142,7 @@ 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
+TrueFalse=nl_multi_line_define\s*=\s*true|nl_multi_line_define\s*=\s*false
 ValueDefault=false
 
 [Nl Before Case]
@@ -4007,7 +4150,7 @@ 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
+TrueFalse=nl_before_case\s*=\s*true|nl_before_case\s*=\s*false
 ValueDefault=false
 
 [Nl After Case]
@@ -4015,7 +4158,7 @@ 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
+TrueFalse=nl_after_case\s*=\s*true|nl_after_case\s*=\s*false
 ValueDefault=false
 
 [Nl Case Colon Brace]
@@ -4023,7 +4166,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|nl_case_colon_brace=not_defined
+Choices=nl_case_colon_brace\s*=\s*ignore|nl_case_colon_brace\s*=\s*add|nl_case_colon_brace\s*=\s*remove|nl_case_colon_brace\s*=\s*force|nl_case_colon_brace\s*=\s*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
 
@@ -4032,7 +4175,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|nl_before_throw=not_defined
+Choices=nl_before_throw\s*=\s*ignore|nl_before_throw\s*=\s*add|nl_before_throw\s*=\s*remove|nl_before_throw\s*=\s*force|nl_before_throw\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Before Throw|Add Nl Before Throw|Remove Nl Before Throw|Force Nl Before Throw"
 ValueDefault=ignore
 
@@ -4041,7 +4184,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|nl_namespace_brace=not_defined
+Choices=nl_namespace_brace\s*=\s*ignore|nl_namespace_brace\s*=\s*add|nl_namespace_brace\s*=\s*remove|nl_namespace_brace\s*=\s*force|nl_namespace_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Namespace Brace|Add Nl Namespace Brace|Remove Nl Namespace Brace|Force Nl Namespace Brace"
 ValueDefault=ignore
 
@@ -4050,7 +4193,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|nl_template_class=not_defined
+Choices=nl_template_class\s*=\s*ignore|nl_template_class\s*=\s*add|nl_template_class\s*=\s*remove|nl_template_class\s*=\s*force|nl_template_class\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Template Class|Add Nl Template Class|Remove Nl Template Class|Force Nl Template Class"
 ValueDefault=ignore
 
@@ -4059,7 +4202,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|nl_template_class_decl=not_defined
+Choices=nl_template_class_decl\s*=\s*ignore|nl_template_class_decl\s*=\s*add|nl_template_class_decl\s*=\s*remove|nl_template_class_decl\s*=\s*force|nl_template_class_decl\s*=\s*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
 
@@ -4068,7 +4211,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|nl_template_class_decl_special=not_defined
+Choices=nl_template_class_decl_special\s*=\s*ignore|nl_template_class_decl_special\s*=\s*add|nl_template_class_decl_special\s*=\s*remove|nl_template_class_decl_special\s*=\s*force|nl_template_class_decl_special\s*=\s*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
 
@@ -4077,7 +4220,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|nl_template_class_def=not_defined
+Choices=nl_template_class_def\s*=\s*ignore|nl_template_class_def\s*=\s*add|nl_template_class_def\s*=\s*remove|nl_template_class_def\s*=\s*force|nl_template_class_def\s*=\s*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
 
@@ -4086,7 +4229,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|nl_template_class_def_special=not_defined
+Choices=nl_template_class_def_special\s*=\s*ignore|nl_template_class_def_special\s*=\s*add|nl_template_class_def_special\s*=\s*remove|nl_template_class_def_special\s*=\s*force|nl_template_class_def_special\s*=\s*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
 
@@ -4095,7 +4238,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|nl_template_func=not_defined
+Choices=nl_template_func\s*=\s*ignore|nl_template_func\s*=\s*add|nl_template_func\s*=\s*remove|nl_template_func\s*=\s*force|nl_template_func\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Template Func|Add Nl Template Func|Remove Nl Template Func|Force Nl Template Func"
 ValueDefault=ignore
 
@@ -4104,7 +4247,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|nl_template_func_decl=not_defined
+Choices=nl_template_func_decl\s*=\s*ignore|nl_template_func_decl\s*=\s*add|nl_template_func_decl\s*=\s*remove|nl_template_func_decl\s*=\s*force|nl_template_func_decl\s*=\s*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
 
@@ -4113,7 +4256,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|nl_template_func_decl_special=not_defined
+Choices=nl_template_func_decl_special\s*=\s*ignore|nl_template_func_decl_special\s*=\s*add|nl_template_func_decl_special\s*=\s*remove|nl_template_func_decl_special\s*=\s*force|nl_template_func_decl_special\s*=\s*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
 
@@ -4122,7 +4265,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|nl_template_func_def=not_defined
+Choices=nl_template_func_def\s*=\s*ignore|nl_template_func_def\s*=\s*add|nl_template_func_def\s*=\s*remove|nl_template_func_def\s*=\s*force|nl_template_func_def\s*=\s*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
 
@@ -4131,7 +4274,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|nl_template_func_def_special=not_defined
+Choices=nl_template_func_def_special\s*=\s*ignore|nl_template_func_def_special\s*=\s*add|nl_template_func_def_special\s*=\s*remove|nl_template_func_def_special\s*=\s*force|nl_template_func_def_special\s*=\s*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
 
@@ -4140,7 +4283,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|nl_template_var=not_defined
+Choices=nl_template_var\s*=\s*ignore|nl_template_var\s*=\s*add|nl_template_var\s*=\s*remove|nl_template_var\s*=\s*force|nl_template_var\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Template Var|Add Nl Template Var|Remove Nl Template Var|Force Nl Template Var"
 ValueDefault=ignore
 
@@ -4149,7 +4292,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|nl_template_using=not_defined
+Choices=nl_template_using\s*=\s*ignore|nl_template_using\s*=\s*add|nl_template_using\s*=\s*remove|nl_template_using\s*=\s*force|nl_template_using\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Template Using|Add Nl Template Using|Remove Nl Template Using|Force Nl Template Using"
 ValueDefault=ignore
 
@@ -4158,7 +4301,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|nl_class_brace=not_defined
+Choices=nl_class_brace\s*=\s*ignore|nl_class_brace\s*=\s*add|nl_class_brace\s*=\s*remove|nl_class_brace\s*=\s*force|nl_class_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Class Brace|Add Nl Class Brace|Remove Nl Class Brace|Force Nl Class Brace"
 ValueDefault=ignore
 
@@ -4167,7 +4310,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|nl_class_init_args=not_defined
+Choices=nl_class_init_args\s*=\s*ignore|nl_class_init_args\s*=\s*add|nl_class_init_args\s*=\s*remove|nl_class_init_args\s*=\s*force|nl_class_init_args\s*=\s*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
 
@@ -4176,7 +4319,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|nl_constr_init_args=not_defined
+Choices=nl_constr_init_args\s*=\s*ignore|nl_constr_init_args\s*=\s*add|nl_constr_init_args\s*=\s*remove|nl_constr_init_args\s*=\s*force|nl_constr_init_args\s*=\s*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
 
@@ -4185,7 +4328,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|nl_enum_own_lines=not_defined
+Choices=nl_enum_own_lines\s*=\s*ignore|nl_enum_own_lines\s*=\s*add|nl_enum_own_lines\s*=\s*remove|nl_enum_own_lines\s*=\s*force|nl_enum_own_lines\s*=\s*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
 
@@ -4194,7 +4337,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|nl_func_type_name=not_defined
+Choices=nl_func_type_name\s*=\s*ignore|nl_func_type_name\s*=\s*add|nl_func_type_name\s*=\s*remove|nl_func_type_name\s*=\s*force|nl_func_type_name\s*=\s*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
 
@@ -4203,7 +4346,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|nl_func_type_name_class=not_defined
+Choices=nl_func_type_name_class\s*=\s*ignore|nl_func_type_name_class\s*=\s*add|nl_func_type_name_class\s*=\s*remove|nl_func_type_name_class\s*=\s*force|nl_func_type_name_class\s*=\s*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
 
@@ -4212,7 +4355,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|nl_func_class_scope=not_defined
+Choices=nl_func_class_scope\s*=\s*ignore|nl_func_class_scope\s*=\s*add|nl_func_class_scope\s*=\s*remove|nl_func_class_scope\s*=\s*force|nl_func_class_scope\s*=\s*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
 
@@ -4221,7 +4364,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|nl_func_scope_name=not_defined
+Choices=nl_func_scope_name\s*=\s*ignore|nl_func_scope_name\s*=\s*add|nl_func_scope_name\s*=\s*remove|nl_func_scope_name\s*=\s*force|nl_func_scope_name\s*=\s*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
 
@@ -4230,7 +4373,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|nl_func_proto_type_name=not_defined
+Choices=nl_func_proto_type_name\s*=\s*ignore|nl_func_proto_type_name\s*=\s*add|nl_func_proto_type_name\s*=\s*remove|nl_func_proto_type_name\s*=\s*force|nl_func_proto_type_name\s*=\s*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
 
@@ -4239,7 +4382,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|nl_func_paren=not_defined
+Choices=nl_func_paren\s*=\s*ignore|nl_func_paren\s*=\s*add|nl_func_paren\s*=\s*remove|nl_func_paren\s*=\s*force|nl_func_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Func Paren|Add Nl Func Paren|Remove Nl Func Paren|Force Nl Func Paren"
 ValueDefault=ignore
 
@@ -4248,7 +4391,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|nl_func_paren_empty=not_defined
+Choices=nl_func_paren_empty\s*=\s*ignore|nl_func_paren_empty\s*=\s*add|nl_func_paren_empty\s*=\s*remove|nl_func_paren_empty\s*=\s*force|nl_func_paren_empty\s*=\s*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
 
@@ -4257,7 +4400,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|nl_func_def_paren=not_defined
+Choices=nl_func_def_paren\s*=\s*ignore|nl_func_def_paren\s*=\s*add|nl_func_def_paren\s*=\s*remove|nl_func_def_paren\s*=\s*force|nl_func_def_paren\s*=\s*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
 
@@ -4266,7 +4409,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|nl_func_def_paren_empty=not_defined
+Choices=nl_func_def_paren_empty\s*=\s*ignore|nl_func_def_paren_empty\s*=\s*add|nl_func_def_paren_empty\s*=\s*remove|nl_func_def_paren_empty\s*=\s*force|nl_func_def_paren_empty\s*=\s*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
 
@@ -4275,7 +4418,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|nl_func_call_paren=not_defined
+Choices=nl_func_call_paren\s*=\s*ignore|nl_func_call_paren\s*=\s*add|nl_func_call_paren\s*=\s*remove|nl_func_call_paren\s*=\s*force|nl_func_call_paren\s*=\s*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
 
@@ -4284,7 +4427,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|nl_func_call_paren_empty=not_defined
+Choices=nl_func_call_paren_empty\s*=\s*ignore|nl_func_call_paren_empty\s*=\s*add|nl_func_call_paren_empty\s*=\s*remove|nl_func_call_paren_empty\s*=\s*force|nl_func_call_paren_empty\s*=\s*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
 
@@ -4293,7 +4436,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|nl_func_decl_start=not_defined
+Choices=nl_func_decl_start\s*=\s*ignore|nl_func_decl_start\s*=\s*add|nl_func_decl_start\s*=\s*remove|nl_func_decl_start\s*=\s*force|nl_func_decl_start\s*=\s*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
 
@@ -4302,7 +4445,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|nl_func_def_start=not_defined
+Choices=nl_func_def_start\s*=\s*ignore|nl_func_def_start\s*=\s*add|nl_func_def_start\s*=\s*remove|nl_func_def_start\s*=\s*force|nl_func_def_start\s*=\s*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
 
@@ -4311,7 +4454,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|nl_func_decl_start_single=not_defined
+Choices=nl_func_decl_start_single\s*=\s*ignore|nl_func_decl_start_single\s*=\s*add|nl_func_decl_start_single\s*=\s*remove|nl_func_decl_start_single\s*=\s*force|nl_func_decl_start_single\s*=\s*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
 
@@ -4320,7 +4463,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|nl_func_def_start_single=not_defined
+Choices=nl_func_def_start_single\s*=\s*ignore|nl_func_def_start_single\s*=\s*add|nl_func_def_start_single\s*=\s*remove|nl_func_def_start_single\s*=\s*force|nl_func_def_start_single\s*=\s*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
 
@@ -4329,7 +4472,7 @@ 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
+TrueFalse=nl_func_decl_start_multi_line\s*=\s*true|nl_func_decl_start_multi_line\s*=\s*false
 ValueDefault=false
 
 [Nl Func Def Start Multi Line]
@@ -4337,7 +4480,7 @@ 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
+TrueFalse=nl_func_def_start_multi_line\s*=\s*true|nl_func_def_start_multi_line\s*=\s*false
 ValueDefault=false
 
 [Nl Func Decl Args]
@@ -4345,7 +4488,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|nl_func_decl_args=not_defined
+Choices=nl_func_decl_args\s*=\s*ignore|nl_func_decl_args\s*=\s*add|nl_func_decl_args\s*=\s*remove|nl_func_decl_args\s*=\s*force|nl_func_decl_args\s*=\s*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
 
@@ -4354,7 +4497,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|nl_func_def_args=not_defined
+Choices=nl_func_def_args\s*=\s*ignore|nl_func_def_args\s*=\s*add|nl_func_def_args\s*=\s*remove|nl_func_def_args\s*=\s*force|nl_func_def_args\s*=\s*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
 
@@ -4363,7 +4506,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|nl_func_call_args=not_defined
+Choices=nl_func_call_args\s*=\s*ignore|nl_func_call_args\s*=\s*add|nl_func_call_args\s*=\s*remove|nl_func_call_args\s*=\s*force|nl_func_call_args\s*=\s*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
 
@@ -4372,7 +4515,7 @@ 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
+TrueFalse=nl_func_decl_args_multi_line\s*=\s*true|nl_func_decl_args_multi_line\s*=\s*false
 ValueDefault=false
 
 [Nl Func Def Args Multi Line]
@@ -4380,7 +4523,7 @@ 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
+TrueFalse=nl_func_def_args_multi_line\s*=\s*true|nl_func_def_args_multi_line\s*=\s*false
 ValueDefault=false
 
 [Nl Func Decl End]
@@ -4388,7 +4531,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|nl_func_decl_end=not_defined
+Choices=nl_func_decl_end\s*=\s*ignore|nl_func_decl_end\s*=\s*add|nl_func_decl_end\s*=\s*remove|nl_func_decl_end\s*=\s*force|nl_func_decl_end\s*=\s*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
 
@@ -4397,7 +4540,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|nl_func_def_end=not_defined
+Choices=nl_func_def_end\s*=\s*ignore|nl_func_def_end\s*=\s*add|nl_func_def_end\s*=\s*remove|nl_func_def_end\s*=\s*force|nl_func_def_end\s*=\s*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
 
@@ -4406,7 +4549,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|nl_func_decl_end_single=not_defined
+Choices=nl_func_decl_end_single\s*=\s*ignore|nl_func_decl_end_single\s*=\s*add|nl_func_decl_end_single\s*=\s*remove|nl_func_decl_end_single\s*=\s*force|nl_func_decl_end_single\s*=\s*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
 
@@ -4415,7 +4558,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|nl_func_def_end_single=not_defined
+Choices=nl_func_def_end_single\s*=\s*ignore|nl_func_def_end_single\s*=\s*add|nl_func_def_end_single\s*=\s*remove|nl_func_def_end_single\s*=\s*force|nl_func_def_end_single\s*=\s*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
 
@@ -4424,7 +4567,7 @@ 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
+TrueFalse=nl_func_decl_end_multi_line\s*=\s*true|nl_func_decl_end_multi_line\s*=\s*false
 ValueDefault=false
 
 [Nl Func Def End Multi Line]
@@ -4432,7 +4575,7 @@ 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
+TrueFalse=nl_func_def_end_multi_line\s*=\s*true|nl_func_def_end_multi_line\s*=\s*false
 ValueDefault=false
 
 [Nl Func Decl Empty]
@@ -4440,7 +4583,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|nl_func_decl_empty=not_defined
+Choices=nl_func_decl_empty\s*=\s*ignore|nl_func_decl_empty\s*=\s*add|nl_func_decl_empty\s*=\s*remove|nl_func_decl_empty\s*=\s*force|nl_func_decl_empty\s*=\s*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
 
@@ -4449,7 +4592,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|nl_func_def_empty=not_defined
+Choices=nl_func_def_empty\s*=\s*ignore|nl_func_def_empty\s*=\s*add|nl_func_def_empty\s*=\s*remove|nl_func_def_empty\s*=\s*force|nl_func_def_empty\s*=\s*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
 
@@ -4458,7 +4601,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|nl_func_call_empty=not_defined
+Choices=nl_func_call_empty\s*=\s*ignore|nl_func_call_empty\s*=\s*add|nl_func_call_empty\s*=\s*remove|nl_func_call_empty\s*=\s*force|nl_func_call_empty\s*=\s*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
 
@@ -4467,7 +4610,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|nl_func_call_start=not_defined
+Choices=nl_func_call_start\s*=\s*ignore|nl_func_call_start\s*=\s*add|nl_func_call_start\s*=\s*remove|nl_func_call_start\s*=\s*force|nl_func_call_start\s*=\s*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
 
@@ -4476,7 +4619,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|nl_func_call_end=not_defined
+Choices=nl_func_call_end\s*=\s*ignore|nl_func_call_end\s*=\s*add|nl_func_call_end\s*=\s*remove|nl_func_call_end\s*=\s*force|nl_func_call_end\s*=\s*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
 
@@ -4485,7 +4628,7 @@ 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
+TrueFalse=nl_func_call_start_multi_line\s*=\s*true|nl_func_call_start_multi_line\s*=\s*false
 ValueDefault=false
 
 [Nl Func Call Args Multi Line]
@@ -4493,7 +4636,7 @@ 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
+TrueFalse=nl_func_call_args_multi_line\s*=\s*true|nl_func_call_args_multi_line\s*=\s*false
 ValueDefault=false
 
 [Nl Func Call End Multi Line]
@@ -4501,7 +4644,7 @@ 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
+TrueFalse=nl_func_call_end_multi_line\s*=\s*true|nl_func_call_end_multi_line\s*=\s*false
 ValueDefault=false
 
 [Nl Func Call Args Multi Line Ignore Closures]
@@ -4509,7 +4652,7 @@ 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
+TrueFalse=nl_func_call_args_multi_line_ignore_closures\s*=\s*true|nl_func_call_args_multi_line_ignore_closures\s*=\s*false
 ValueDefault=false
 
 [Nl Template Start]
@@ -4517,7 +4660,7 @@ 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
+TrueFalse=nl_template_start\s*=\s*true|nl_template_start\s*=\s*false
 ValueDefault=false
 
 [Nl Template Args]
@@ -4525,7 +4668,7 @@ 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
+TrueFalse=nl_template_args\s*=\s*true|nl_template_args\s*=\s*false
 ValueDefault=false
 
 [Nl Template End]
@@ -4533,7 +4676,7 @@ 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
+TrueFalse=nl_template_end\s*=\s*true|nl_template_end\s*=\s*false
 ValueDefault=false
 
 [Nl Oc Msg Args]
@@ -4541,7 +4684,7 @@ 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
+TrueFalse=nl_oc_msg_args\s*=\s*true|nl_oc_msg_args\s*=\s*false
 ValueDefault=false
 
 [Nl Oc Msg Args Min Params]
@@ -4549,7 +4692,7 @@ Category=3
 Description="<html>(OC) Minimum number of Objective-C message parameters before applying nl_oc_msg_args.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_oc_msg_args_min_params="
+CallName="nl_oc_msg_args_min_params\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -4559,7 +4702,7 @@ Category=3
 Description="<html>(OC) Max code width of Objective-C message before applying nl_oc_msg_args.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_oc_msg_args_max_code_width="
+CallName="nl_oc_msg_args_max_code_width\s*=\s*"
 MinVal=0
 MaxVal=10000
 ValueDefault=0
@@ -4569,7 +4712,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|nl_fdef_brace=not_defined
+Choices=nl_fdef_brace\s*=\s*ignore|nl_fdef_brace\s*=\s*add|nl_fdef_brace\s*=\s*remove|nl_fdef_brace\s*=\s*force|nl_fdef_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Fdef Brace|Add Nl Fdef Brace|Remove Nl Fdef Brace|Force Nl Fdef Brace"
 ValueDefault=ignore
 
@@ -4578,7 +4721,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|nl_fdef_brace_cond=not_defined
+Choices=nl_fdef_brace_cond\s*=\s*ignore|nl_fdef_brace_cond\s*=\s*add|nl_fdef_brace_cond\s*=\s*remove|nl_fdef_brace_cond\s*=\s*force|nl_fdef_brace_cond\s*=\s*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
 
@@ -4587,7 +4730,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|nl_cpp_ldef_brace=not_defined
+Choices=nl_cpp_ldef_brace\s*=\s*ignore|nl_cpp_ldef_brace\s*=\s*add|nl_cpp_ldef_brace\s*=\s*remove|nl_cpp_ldef_brace\s*=\s*force|nl_cpp_ldef_brace\s*=\s*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
 
@@ -4596,7 +4739,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|nl_return_expr=not_defined
+Choices=nl_return_expr\s*=\s*ignore|nl_return_expr\s*=\s*add|nl_return_expr\s*=\s*remove|nl_return_expr\s*=\s*force|nl_return_expr\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Return Expr|Add Nl Return Expr|Remove Nl Return Expr|Force Nl Return Expr"
 ValueDefault=ignore
 
@@ -4605,7 +4748,7 @@ Category=3
 Description="<html>Add or remove newline between 'throw' and the throw expression.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_throw_expr=ignore|nl_throw_expr=add|nl_throw_expr=remove|nl_throw_expr=force|nl_throw_expr=not_defined
+Choices=nl_throw_expr\s*=\s*ignore|nl_throw_expr\s*=\s*add|nl_throw_expr\s*=\s*remove|nl_throw_expr\s*=\s*force|nl_throw_expr\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Throw Expr|Add Nl Throw Expr|Remove Nl Throw Expr|Force Nl Throw Expr"
 ValueDefault=ignore
 
@@ -4614,7 +4757,7 @@ 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
+TrueFalse=nl_after_semicolon\s*=\s*true|nl_after_semicolon\s*=\s*false
 ValueDefault=false
 
 [Nl Paren Dbrace Open]
@@ -4622,7 +4765,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|nl_paren_dbrace_open=not_defined
+Choices=nl_paren_dbrace_open\s*=\s*ignore|nl_paren_dbrace_open\s*=\s*add|nl_paren_dbrace_open\s*=\s*remove|nl_paren_dbrace_open\s*=\s*force|nl_paren_dbrace_open\s*=\s*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
 
@@ -4631,7 +4774,7 @@ Category=3
 Description="<html>Whether to add a newline after the type in an unnamed temporary<br/>direct-list-initialization, better:<br/>before a 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
+Choices=nl_type_brace_init_lst\s*=\s*ignore|nl_type_brace_init_lst\s*=\s*add|nl_type_brace_init_lst\s*=\s*remove|nl_type_brace_init_lst\s*=\s*force|nl_type_brace_init_lst\s*=\s*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
 
@@ -4640,7 +4783,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|nl_type_brace_init_lst_open=not_defined
+Choices=nl_type_brace_init_lst_open\s*=\s*ignore|nl_type_brace_init_lst_open\s*=\s*add|nl_type_brace_init_lst_open\s*=\s*remove|nl_type_brace_init_lst_open\s*=\s*force|nl_type_brace_init_lst_open\s*=\s*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
 
@@ -4649,7 +4792,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|nl_type_brace_init_lst_close=not_defined
+Choices=nl_type_brace_init_lst_close\s*=\s*ignore|nl_type_brace_init_lst_close\s*=\s*add|nl_type_brace_init_lst_close\s*=\s*remove|nl_type_brace_init_lst_close\s*=\s*force|nl_type_brace_init_lst_close\s*=\s*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
 
@@ -4658,7 +4801,7 @@ Category=3
 Description="<html>Whether to add a newline before '{'.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=nl_before_brace_open=true|nl_before_brace_open=false
+TrueFalse=nl_before_brace_open\s*=\s*true|nl_before_brace_open\s*=\s*false
 ValueDefault=false
 
 [Nl After Brace Open]
@@ -4666,7 +4809,7 @@ Category=3
 Description="<html>Whether to add a newline after '{'.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=nl_after_brace_open=true|nl_after_brace_open=false
+TrueFalse=nl_after_brace_open\s*=\s*true|nl_after_brace_open\s*=\s*false
 ValueDefault=false
 
 [Nl After Brace Open Cmt]
@@ -4674,7 +4817,7 @@ 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
+TrueFalse=nl_after_brace_open_cmt\s*=\s*true|nl_after_brace_open_cmt\s*=\s*false
 ValueDefault=false
 
 [Nl After Vbrace Open]
@@ -4682,7 +4825,7 @@ 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
+TrueFalse=nl_after_vbrace_open\s*=\s*true|nl_after_vbrace_open\s*=\s*false
 ValueDefault=false
 
 [Nl After Vbrace Open Empty]
@@ -4690,7 +4833,7 @@ 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
+TrueFalse=nl_after_vbrace_open_empty\s*=\s*true|nl_after_vbrace_open_empty\s*=\s*false
 ValueDefault=false
 
 [Nl After Brace Close]
@@ -4698,7 +4841,7 @@ 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
+TrueFalse=nl_after_brace_close\s*=\s*true|nl_after_brace_close\s*=\s*false
 ValueDefault=false
 
 [Nl After Vbrace Close]
@@ -4706,7 +4849,7 @@ 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
+TrueFalse=nl_after_vbrace_close\s*=\s*true|nl_after_vbrace_close\s*=\s*false
 ValueDefault=false
 
 [Nl Brace Struct Var]
@@ -4714,7 +4857,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|nl_brace_struct_var=not_defined
+Choices=nl_brace_struct_var\s*=\s*ignore|nl_brace_struct_var\s*=\s*add|nl_brace_struct_var\s*=\s*remove|nl_brace_struct_var\s*=\s*force|nl_brace_struct_var\s*=\s*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
 
@@ -4723,7 +4866,7 @@ 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
+TrueFalse=nl_define_macro\s*=\s*true|nl_define_macro\s*=\s*false
 ValueDefault=false
 
 [Nl Squeeze Paren Close]
@@ -4731,7 +4874,7 @@ 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
+TrueFalse=nl_squeeze_paren_close\s*=\s*true|nl_squeeze_paren_close\s*=\s*false
 ValueDefault=false
 
 [Nl Squeeze Ifdef]
@@ -4739,7 +4882,7 @@ 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
+TrueFalse=nl_squeeze_ifdef\s*=\s*true|nl_squeeze_ifdef\s*=\s*false
 ValueDefault=false
 
 [Nl Squeeze Ifdef Top Level]
@@ -4747,7 +4890,7 @@ 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
+TrueFalse=nl_squeeze_ifdef_top_level\s*=\s*true|nl_squeeze_ifdef_top_level\s*=\s*false
 ValueDefault=false
 
 [Nl Before If]
@@ -4755,7 +4898,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|nl_before_if=not_defined
+Choices=nl_before_if\s*=\s*ignore|nl_before_if\s*=\s*add|nl_before_if\s*=\s*remove|nl_before_if\s*=\s*force|nl_before_if\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Before If|Add Nl Before If|Remove Nl Before If|Force Nl Before If"
 ValueDefault=ignore
 
@@ -4764,7 +4907,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|nl_after_if=not_defined
+Choices=nl_after_if\s*=\s*ignore|nl_after_if\s*=\s*add|nl_after_if\s*=\s*remove|nl_after_if\s*=\s*force|nl_after_if\s*=\s*not_defined
 ChoicesReadable="Ignore Nl After If|Add Nl After If|Remove Nl After If|Force Nl After If"
 ValueDefault=ignore
 
@@ -4773,7 +4916,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|nl_before_for=not_defined
+Choices=nl_before_for\s*=\s*ignore|nl_before_for\s*=\s*add|nl_before_for\s*=\s*remove|nl_before_for\s*=\s*force|nl_before_for\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Before For|Add Nl Before For|Remove Nl Before For|Force Nl Before For"
 ValueDefault=ignore
 
@@ -4782,7 +4925,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|nl_after_for=not_defined
+Choices=nl_after_for\s*=\s*ignore|nl_after_for\s*=\s*add|nl_after_for\s*=\s*remove|nl_after_for\s*=\s*force|nl_after_for\s*=\s*not_defined
 ChoicesReadable="Ignore Nl After For|Add Nl After For|Remove Nl After For|Force Nl After For"
 ValueDefault=ignore
 
@@ -4791,7 +4934,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|nl_before_while=not_defined
+Choices=nl_before_while\s*=\s*ignore|nl_before_while\s*=\s*add|nl_before_while\s*=\s*remove|nl_before_while\s*=\s*force|nl_before_while\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Before While|Add Nl Before While|Remove Nl Before While|Force Nl Before While"
 ValueDefault=ignore
 
@@ -4800,7 +4943,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|nl_after_while=not_defined
+Choices=nl_after_while\s*=\s*ignore|nl_after_while\s*=\s*add|nl_after_while\s*=\s*remove|nl_after_while\s*=\s*force|nl_after_while\s*=\s*not_defined
 ChoicesReadable="Ignore Nl After While|Add Nl After While|Remove Nl After While|Force Nl After While"
 ValueDefault=ignore
 
@@ -4809,7 +4952,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|nl_before_switch=not_defined
+Choices=nl_before_switch\s*=\s*ignore|nl_before_switch\s*=\s*add|nl_before_switch\s*=\s*remove|nl_before_switch\s*=\s*force|nl_before_switch\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Before Switch|Add Nl Before Switch|Remove Nl Before Switch|Force Nl Before Switch"
 ValueDefault=ignore
 
@@ -4818,7 +4961,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|nl_after_switch=not_defined
+Choices=nl_after_switch\s*=\s*ignore|nl_after_switch\s*=\s*add|nl_after_switch\s*=\s*remove|nl_after_switch\s*=\s*force|nl_after_switch\s*=\s*not_defined
 ChoicesReadable="Ignore Nl After Switch|Add Nl After Switch|Remove Nl After Switch|Force Nl After Switch"
 ValueDefault=ignore
 
@@ -4827,7 +4970,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|nl_before_synchronized=not_defined
+Choices=nl_before_synchronized\s*=\s*ignore|nl_before_synchronized\s*=\s*add|nl_before_synchronized\s*=\s*remove|nl_before_synchronized\s*=\s*force|nl_before_synchronized\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Before Synchronized|Add Nl Before Synchronized|Remove Nl Before Synchronized|Force Nl Before Synchronized"
 ValueDefault=ignore
 
@@ -4836,7 +4979,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|nl_after_synchronized=not_defined
+Choices=nl_after_synchronized\s*=\s*ignore|nl_after_synchronized\s*=\s*add|nl_after_synchronized\s*=\s*remove|nl_after_synchronized\s*=\s*force|nl_after_synchronized\s*=\s*not_defined
 ChoicesReadable="Ignore Nl After Synchronized|Add Nl After Synchronized|Remove Nl After Synchronized|Force Nl After Synchronized"
 ValueDefault=ignore
 
@@ -4845,7 +4988,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|nl_before_do=not_defined
+Choices=nl_before_do\s*=\s*ignore|nl_before_do\s*=\s*add|nl_before_do\s*=\s*remove|nl_before_do\s*=\s*force|nl_before_do\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Before Do|Add Nl Before Do|Remove Nl Before Do|Force Nl Before Do"
 ValueDefault=ignore
 
@@ -4854,7 +4997,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|nl_after_do=not_defined
+Choices=nl_after_do\s*=\s*ignore|nl_after_do\s*=\s*add|nl_after_do\s*=\s*remove|nl_after_do\s*=\s*force|nl_after_do\s*=\s*not_defined
 ChoicesReadable="Ignore Nl After Do|Add Nl After Do|Remove Nl After Do|Force Nl After Do"
 ValueDefault=ignore
 
@@ -4863,7 +5006,7 @@ Category=3
 Description="<html>Ignore nl_before_{if,for,switch,do,synchronized} if the control<br/>statement is immediately after a case statement.<br/>if nl_before_{if,for,switch,do} is set to remove, this option<br/>does nothing.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=nl_before_ignore_after_case=true|nl_before_ignore_after_case=false
+TrueFalse=nl_before_ignore_after_case\s*=\s*true|nl_before_ignore_after_case\s*=\s*false
 ValueDefault=false
 
 [Nl Before Return]
@@ -4871,7 +5014,7 @@ 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
+TrueFalse=nl_before_return\s*=\s*true|nl_before_return\s*=\s*false
 ValueDefault=false
 
 [Nl After Return]
@@ -4879,7 +5022,7 @@ 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
+TrueFalse=nl_after_return\s*=\s*true|nl_after_return\s*=\s*false
 ValueDefault=false
 
 [Nl Before Member]
@@ -4887,7 +5030,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|nl_before_member=not_defined
+Choices=nl_before_member\s*=\s*ignore|nl_before_member\s*=\s*add|nl_before_member\s*=\s*remove|nl_before_member\s*=\s*force|nl_before_member\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Before Member|Add Nl Before Member|Remove Nl Before Member|Force Nl Before Member"
 ValueDefault=ignore
 
@@ -4896,7 +5039,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|nl_after_member=not_defined
+Choices=nl_after_member\s*=\s*ignore|nl_after_member\s*=\s*add|nl_after_member\s*=\s*remove|nl_after_member\s*=\s*force|nl_after_member\s*=\s*not_defined
 ChoicesReadable="Ignore Nl After Member|Add Nl After Member|Remove Nl After Member|Force Nl After Member"
 ValueDefault=ignore
 
@@ -4905,7 +5048,7 @@ 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
+TrueFalse=nl_ds_struct_enum_cmt\s*=\s*true|nl_ds_struct_enum_cmt\s*=\s*false
 ValueDefault=false
 
 [Nl Ds Struct Enum Close Brace]
@@ -4913,7 +5056,7 @@ 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
+TrueFalse=nl_ds_struct_enum_close_brace\s*=\s*true|nl_ds_struct_enum_close_brace\s*=\s*false
 ValueDefault=false
 
 [Nl Class Colon]
@@ -4921,7 +5064,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|nl_class_colon=not_defined
+Choices=nl_class_colon\s*=\s*ignore|nl_class_colon\s*=\s*add|nl_class_colon\s*=\s*remove|nl_class_colon\s*=\s*force|nl_class_colon\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Class Colon|Add Nl Class Colon|Remove Nl Class Colon|Force Nl Class Colon"
 ValueDefault=ignore
 
@@ -4930,7 +5073,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|nl_constr_colon=not_defined
+Choices=nl_constr_colon\s*=\s*ignore|nl_constr_colon\s*=\s*add|nl_constr_colon\s*=\s*remove|nl_constr_colon\s*=\s*force|nl_constr_colon\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Constr Colon|Add Nl Constr Colon|Remove Nl Constr Colon|Force Nl Constr Colon"
 ValueDefault=ignore
 
@@ -4939,7 +5082,7 @@ 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. If true, it also preserves one-liner namespaces.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=nl_namespace_two_to_one_liner=true|nl_namespace_two_to_one_liner=false
+TrueFalse=nl_namespace_two_to_one_liner\s*=\s*true|nl_namespace_two_to_one_liner\s*=\s*false
 ValueDefault=false
 
 [Nl Create If One Liner]
@@ -4947,7 +5090,7 @@ 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
+TrueFalse=nl_create_if_one_liner\s*=\s*true|nl_create_if_one_liner\s*=\s*false
 ValueDefault=false
 
 [Nl Create For One Liner]
@@ -4955,7 +5098,7 @@ 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
+TrueFalse=nl_create_for_one_liner\s*=\s*true|nl_create_for_one_liner\s*=\s*false
 ValueDefault=false
 
 [Nl Create While One Liner]
@@ -4963,7 +5106,7 @@ 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
+TrueFalse=nl_create_while_one_liner\s*=\s*true|nl_create_while_one_liner\s*=\s*false
 ValueDefault=false
 
 [Nl Create Func Def One Liner]
@@ -4971,7 +5114,7 @@ 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
+TrueFalse=nl_create_func_def_one_liner\s*=\s*true|nl_create_func_def_one_liner\s*=\s*false
 ValueDefault=false
 
 [Nl Create List One Liner]
@@ -4979,7 +5122,7 @@ Category=3
 Description="<html>Whether to split one-line simple list definitions 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
+TrueFalse=nl_create_list_one_liner\s*=\s*true|nl_create_list_one_liner\s*=\s*false
 ValueDefault=false
 
 [Nl Split If One Liner]
@@ -4987,7 +5130,7 @@ 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
+TrueFalse=nl_split_if_one_liner\s*=\s*true|nl_split_if_one_liner\s*=\s*false
 ValueDefault=false
 
 [Nl Split For One Liner]
@@ -4995,7 +5138,7 @@ 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
+TrueFalse=nl_split_for_one_liner\s*=\s*true|nl_split_for_one_liner\s*=\s*false
 ValueDefault=false
 
 [Nl Split While One Liner]
@@ -5003,7 +5146,7 @@ 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
+TrueFalse=nl_split_while_one_liner\s*=\s*true|nl_split_while_one_liner\s*=\s*false
 ValueDefault=false
 
 [Donot Add Nl Before Cpp Comment]
@@ -5011,7 +5154,7 @@ 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
+TrueFalse=donot_add_nl_before_cpp_comment\s*=\s*true|donot_add_nl_before_cpp_comment\s*=\s*false
 ValueDefault=false
 
 [Nl Max]
@@ -5019,7 +5162,7 @@ Category=4
 Description="<html>The maximum number of consecutive newlines (3 = 2 blank lines).</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_max="
+CallName="nl_max\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5029,7 +5172,7 @@ Category=4
 Description="<html>The maximum number of consecutive newlines in a function.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_max_blank_in_func="
+CallName="nl_max_blank_in_func\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5039,7 +5182,7 @@ 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_functions=true</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_inside_empty_func="
+CallName="nl_inside_empty_func\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5049,7 +5192,7 @@ Category=4
 Description="<html>The number of newlines before a function prototype.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_before_func_body_proto="
+CallName="nl_before_func_body_proto\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5059,7 +5202,7 @@ 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="
+CallName="nl_before_func_body_def\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5069,7 +5212,7 @@ 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="
+CallName="nl_before_func_class_proto\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5079,7 +5222,7 @@ 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="
+CallName="nl_before_func_class_def\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5089,7 +5232,7 @@ Category=4
 Description="<html>The number of newlines after a function prototype.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_after_func_proto="
+CallName="nl_after_func_proto\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5099,7 +5242,7 @@ 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="
+CallName="nl_after_func_proto_group\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5109,7 +5252,7 @@ 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="
+CallName="nl_after_func_class_proto\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5119,7 +5262,7 @@ 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="
+CallName="nl_after_func_class_proto_group\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5129,15 +5272,35 @@ 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
+TrueFalse=nl_class_leave_one_liner_groups\s*=\s*true|nl_class_leave_one_liner_groups\s*=\s*false
 ValueDefault=false
 
 [Nl After Func Body]
 Category=4
-Description="<html>The number of newlines after '}' of a multi-line function body.</html>"
+Description="<html>The number of newlines after '}' of a multi-line function body.<br/><br/>Overrides nl_min_after_func_body and nl_max_after_func_body.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_after_func_body="
+CallName="nl_after_func_body\s*=\s*"
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Min After Func Body]
+Category=4
+Description="<html>The minimum number of newlines after '}' of a multi-line function body.<br/><br/>Only works when nl_after_func_body is 0.</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_min_after_func_body\s*=\s*"
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Max After Func Body]
+Category=4
+Description="<html>The maximum number of newlines after '}' of a multi-line function body.<br/><br/>Only works when nl_after_func_body is 0.<br/>Takes precedence over nl_min_after_func_body.</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_max_after_func_body\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5147,7 +5310,7 @@ 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="
+CallName="nl_after_func_body_class\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5157,7 +5320,7 @@ 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="
+CallName="nl_after_func_body_one_liner\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5167,7 +5330,7 @@ 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="
+CallName="nl_typedef_blk_start\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5177,7 +5340,7 @@ 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="
+CallName="nl_typedef_blk_end\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5187,7 +5350,7 @@ 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="
+CallName="nl_typedef_blk_in\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5197,7 +5360,7 @@ Category=4
 Description="<html>The minimum number of blank lines after a block of variable definitions<br/>at the top of a function body. If any preprocessor directives appear<br/>between the opening brace of the function and the variable block, then<br/>it is considered as not at the top of the function.Newlines are added<br/>before trailing preprocessor directives, if any exist.<br/><br/>0: No change (default).</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_var_def_blk_end_func_top="
+CallName="nl_var_def_blk_end_func_top\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5207,7 +5370,7 @@ Category=4
 Description="<html>The minimum number of empty newlines before a block of variable definitions<br/>not at the top of a function body. If nl_after_access_spec is non-zero,<br/>that option takes precedence. Newlines are not added at the top of the<br/>file or just after an opening brace. Newlines are added above any<br/>preprocessor directives before the block.<br/><br/>0: No change (default).</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_var_def_blk_start="
+CallName="nl_var_def_blk_start\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5217,7 +5380,7 @@ Category=4
 Description="<html>The minimum number of empty newlines after a block of variable definitions<br/>not at the top of a function body. Newlines are not added if the block<br/>is at the bottom of the file or just before a preprocessor directive.<br/><br/>0: No change (default).</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_var_def_blk_end="
+CallName="nl_var_def_blk_end\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5227,7 +5390,7 @@ 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="
+CallName="nl_var_def_blk_in\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5237,7 +5400,7 @@ 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="
+CallName="nl_before_block_comment\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5247,7 +5410,7 @@ 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="
+CallName="nl_before_c_comment\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5257,7 +5420,7 @@ 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="
+CallName="nl_before_cpp_comment\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5267,7 +5430,7 @@ 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
+TrueFalse=nl_after_multiline_comment\s*=\s*true|nl_after_multiline_comment\s*=\s*false
 ValueDefault=false
 
 [Nl After Label Colon]
@@ -5275,7 +5438,7 @@ 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
+TrueFalse=nl_after_label_colon\s*=\s*true|nl_after_label_colon\s*=\s*false
 ValueDefault=false
 
 [Nl Before Struct]
@@ -5283,7 +5446,7 @@ Category=4
 Description="<html>The number of newlines before a struct definition.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_before_struct="
+CallName="nl_before_struct\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5293,7 +5456,7 @@ 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="
+CallName="nl_after_struct\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5303,7 +5466,7 @@ Category=4
 Description="<html>The number of newlines before a class definition.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_before_class="
+CallName="nl_before_class\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5313,7 +5476,7 @@ Category=4
 Description="<html>The number of newlines after '}' or ';' of a class definition.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_after_class="
+CallName="nl_after_class\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5323,7 +5486,7 @@ Category=4
 Description="<html>The number of newlines before a namespace.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_before_namespace="
+CallName="nl_before_namespace\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5333,7 +5496,7 @@ 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="
+CallName="nl_inside_namespace\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5343,7 +5506,7 @@ Category=4
 Description="<html>The number of newlines after '}' of a namespace.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_after_namespace="
+CallName="nl_after_namespace\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5353,7 +5516,7 @@ 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="
+CallName="nl_before_access_spec\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5363,7 +5526,7 @@ 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="
+CallName="nl_after_access_spec\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5373,7 +5536,7 @@ 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="
+CallName="nl_comment_func_def\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5383,7 +5546,7 @@ 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="
+CallName="nl_after_try_catch_finally\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5393,7 +5556,7 @@ 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="
+CallName="nl_around_cs_property\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5403,7 +5566,7 @@ 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="
+CallName="nl_between_get_set\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5413,7 +5576,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|nl_property_brace=not_defined
+Choices=nl_property_brace\s*=\s*ignore|nl_property_brace\s*=\s*add|nl_property_brace\s*=\s*remove|nl_property_brace\s*=\s*force|nl_property_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Property Brace|Add Nl Property Brace|Remove Nl Property Brace|Force Nl Property Brace"
 ValueDefault=ignore
 
@@ -5422,7 +5585,7 @@ 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
+TrueFalse=eat_blanks_after_open_brace\s*=\s*true|eat_blanks_after_open_brace\s*=\s*false
 ValueDefault=false
 
 [Eat Blanks Before Close Brace]
@@ -5430,7 +5593,7 @@ 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
+TrueFalse=eat_blanks_before_close_brace\s*=\s*true|eat_blanks_before_close_brace\s*=\s*false
 ValueDefault=false
 
 [Nl Remove Extra Newlines]
@@ -5438,7 +5601,7 @@ 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="
+CallName="nl_remove_extra_newlines\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -5448,7 +5611,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|nl_after_annotation=not_defined
+Choices=nl_after_annotation\s*=\s*ignore|nl_after_annotation\s*=\s*add|nl_after_annotation\s*=\s*remove|nl_after_annotation\s*=\s*force|nl_after_annotation\s*=\s*not_defined
 ChoicesReadable="Ignore Nl After Annotation|Add Nl After Annotation|Remove Nl After Annotation|Force Nl After Annotation"
 ValueDefault=ignore
 
@@ -5457,7 +5620,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|nl_between_annotation=not_defined
+Choices=nl_between_annotation\s*=\s*ignore|nl_between_annotation\s*=\s*add|nl_between_annotation\s*=\s*remove|nl_between_annotation\s*=\s*force|nl_between_annotation\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Between Annotation|Add Nl Between Annotation|Remove Nl Between Annotation|Force Nl Between Annotation"
 ValueDefault=ignore
 
@@ -5466,7 +5629,7 @@ 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="
+CallName="nl_before_whole_file_ifdef\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5476,7 +5639,7 @@ 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="
+CallName="nl_after_whole_file_ifdef\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5486,7 +5649,7 @@ 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="
+CallName="nl_before_whole_file_endif\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5496,7 +5659,7 @@ 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="
+CallName="nl_after_whole_file_endif\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5506,7 +5669,7 @@ Category=5
 Description="<html>The position of arithmetic operators in wrapped expressions.</html>"
 Enabled=false
 EditorType=multiple
-Choices=pos_arith=ignore|pos_arith=break|pos_arith=force|pos_arith=lead|pos_arith=trail|pos_arith=join|pos_arith=lead_break|pos_arith=lead_force|pos_arith=trail_break|pos_arith=trail_force
+Choices=pos_arith\s*=\s*ignore|pos_arith\s*=\s*break|pos_arith\s*=\s*force|pos_arith\s*=\s*lead|pos_arith\s*=\s*trail|pos_arith\s*=\s*join|pos_arith\s*=\s*lead_break|pos_arith\s*=\s*lead_force|pos_arith\s*=\s*trail_break|pos_arith\s*=\s*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
 
@@ -5515,7 +5678,7 @@ 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
+Choices=pos_assign\s*=\s*ignore|pos_assign\s*=\s*break|pos_assign\s*=\s*force|pos_assign\s*=\s*lead|pos_assign\s*=\s*trail|pos_assign\s*=\s*join|pos_assign\s*=\s*lead_break|pos_assign\s*=\s*lead_force|pos_assign\s*=\s*trail_break|pos_assign\s*=\s*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
 
@@ -5524,7 +5687,7 @@ 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
+Choices=pos_bool\s*=\s*ignore|pos_bool\s*=\s*break|pos_bool\s*=\s*force|pos_bool\s*=\s*lead|pos_bool\s*=\s*trail|pos_bool\s*=\s*join|pos_bool\s*=\s*lead_break|pos_bool\s*=\s*lead_force|pos_bool\s*=\s*trail_break|pos_bool\s*=\s*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
 
@@ -5533,7 +5696,7 @@ Category=5
 Description="<html>The position of comparison operators in wrapped expressions.</html>"
 Enabled=false
 EditorType=multiple
-Choices=pos_compare=ignore|pos_compare=break|pos_compare=force|pos_compare=lead|pos_compare=trail|pos_compare=join|pos_compare=lead_break|pos_compare=lead_force|pos_compare=trail_break|pos_compare=trail_force
+Choices=pos_compare\s*=\s*ignore|pos_compare\s*=\s*break|pos_compare\s*=\s*force|pos_compare\s*=\s*lead|pos_compare\s*=\s*trail|pos_compare\s*=\s*join|pos_compare\s*=\s*lead_break|pos_compare\s*=\s*lead_force|pos_compare\s*=\s*trail_break|pos_compare\s*=\s*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
 
@@ -5542,7 +5705,7 @@ 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
+Choices=pos_conditional\s*=\s*ignore|pos_conditional\s*=\s*break|pos_conditional\s*=\s*force|pos_conditional\s*=\s*lead|pos_conditional\s*=\s*trail|pos_conditional\s*=\s*join|pos_conditional\s*=\s*lead_break|pos_conditional\s*=\s*lead_force|pos_conditional\s*=\s*trail_break|pos_conditional\s*=\s*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
 
@@ -5551,7 +5714,7 @@ Category=5
 Description="<html>The position of the comma in wrapped expressions.</html>"
 Enabled=false
 EditorType=multiple
-Choices=pos_comma=ignore|pos_comma=break|pos_comma=force|pos_comma=lead|pos_comma=trail|pos_comma=join|pos_comma=lead_break|pos_comma=lead_force|pos_comma=trail_break|pos_comma=trail_force
+Choices=pos_comma\s*=\s*ignore|pos_comma\s*=\s*break|pos_comma\s*=\s*force|pos_comma\s*=\s*lead|pos_comma\s*=\s*trail|pos_comma\s*=\s*join|pos_comma\s*=\s*lead_break|pos_comma\s*=\s*lead_force|pos_comma\s*=\s*trail_break|pos_comma\s*=\s*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
 
@@ -5560,7 +5723,7 @@ Category=5
 Description="<html>The position of the comma in enum entries.</html>"
 Enabled=false
 EditorType=multiple
-Choices=pos_enum_comma=ignore|pos_enum_comma=break|pos_enum_comma=force|pos_enum_comma=lead|pos_enum_comma=trail|pos_enum_comma=join|pos_enum_comma=lead_break|pos_enum_comma=lead_force|pos_enum_comma=trail_break|pos_enum_comma=trail_force
+Choices=pos_enum_comma\s*=\s*ignore|pos_enum_comma\s*=\s*break|pos_enum_comma\s*=\s*force|pos_enum_comma\s*=\s*lead|pos_enum_comma\s*=\s*trail|pos_enum_comma\s*=\s*join|pos_enum_comma\s*=\s*lead_break|pos_enum_comma\s*=\s*lead_force|pos_enum_comma\s*=\s*trail_break|pos_enum_comma\s*=\s*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
 
@@ -5569,7 +5732,7 @@ 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
+Choices=pos_class_comma\s*=\s*ignore|pos_class_comma\s*=\s*break|pos_class_comma\s*=\s*force|pos_class_comma\s*=\s*lead|pos_class_comma\s*=\s*trail|pos_class_comma\s*=\s*join|pos_class_comma\s*=\s*lead_break|pos_class_comma\s*=\s*lead_force|pos_class_comma\s*=\s*trail_break|pos_class_comma\s*=\s*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
 
@@ -5578,7 +5741,7 @@ 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
+Choices=pos_constr_comma\s*=\s*ignore|pos_constr_comma\s*=\s*break|pos_constr_comma\s*=\s*force|pos_constr_comma\s*=\s*lead|pos_constr_comma\s*=\s*trail|pos_constr_comma\s*=\s*join|pos_constr_comma\s*=\s*lead_break|pos_constr_comma\s*=\s*lead_force|pos_constr_comma\s*=\s*trail_break|pos_constr_comma\s*=\s*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
 
@@ -5587,7 +5750,7 @@ 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
+Choices=pos_class_colon\s*=\s*ignore|pos_class_colon\s*=\s*break|pos_class_colon\s*=\s*force|pos_class_colon\s*=\s*lead|pos_class_colon\s*=\s*trail|pos_class_colon\s*=\s*join|pos_class_colon\s*=\s*lead_break|pos_class_colon\s*=\s*lead_force|pos_class_colon\s*=\s*trail_break|pos_class_colon\s*=\s*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
 
@@ -5596,7 +5759,7 @@ 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
+Choices=pos_constr_colon\s*=\s*ignore|pos_constr_colon\s*=\s*break|pos_constr_colon\s*=\s*force|pos_constr_colon\s*=\s*lead|pos_constr_colon\s*=\s*trail|pos_constr_colon\s*=\s*join|pos_constr_colon\s*=\s*lead_break|pos_constr_colon\s*=\s*lead_force|pos_constr_colon\s*=\s*trail_break|pos_constr_colon\s*=\s*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
 
@@ -5605,7 +5768,7 @@ 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
+Choices=pos_shift\s*=\s*ignore|pos_shift\s*=\s*break|pos_shift\s*=\s*force|pos_shift\s*=\s*lead|pos_shift\s*=\s*trail|pos_shift\s*=\s*join|pos_shift\s*=\s*lead_break|pos_shift\s*=\s*lead_force|pos_shift\s*=\s*trail_break|pos_shift\s*=\s*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
 
@@ -5614,7 +5777,7 @@ Category=6
 Description="<html>Try to limit code width to N columns.</html>"
 Enabled=false
 EditorType=numeric
-CallName="code_width="
+CallName="code_width\s*=\s*"
 MinVal=0
 MaxVal=10000
 ValueDefault=0
@@ -5624,7 +5787,7 @@ 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
+TrueFalse=ls_for_split_full\s*=\s*true|ls_for_split_full\s*=\s*false
 ValueDefault=false
 
 [Ls Func Split Full]
@@ -5632,7 +5795,7 @@ 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
+TrueFalse=ls_func_split_full\s*=\s*true|ls_func_split_full\s*=\s*false
 ValueDefault=false
 
 [Ls Code Width]
@@ -5640,7 +5803,7 @@ 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
+TrueFalse=ls_code_width\s*=\s*true|ls_code_width\s*=\s*false
 ValueDefault=false
 
 [Align Keep Tabs]
@@ -5648,7 +5811,7 @@ Category=7
 Description="<html>Whether to keep non-indenting tabs.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=align_keep_tabs=true|align_keep_tabs=false
+TrueFalse=align_keep_tabs\s*=\s*true|align_keep_tabs\s*=\s*false
 ValueDefault=false
 
 [Align With Tabs]
@@ -5656,7 +5819,7 @@ Category=7
 Description="<html>Whether to use tabs for aligning.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=align_with_tabs=true|align_with_tabs=false
+TrueFalse=align_with_tabs\s*=\s*true|align_with_tabs\s*=\s*false
 ValueDefault=false
 
 [Align On Tabstop]
@@ -5664,7 +5827,7 @@ 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
+TrueFalse=align_on_tabstop\s*=\s*true|align_on_tabstop\s*=\s*false
 ValueDefault=false
 
 [Align Number Right]
@@ -5672,7 +5835,7 @@ Category=7
 Description="<html>Whether to right-align numbers.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=align_number_right=true|align_number_right=false
+TrueFalse=align_number_right\s*=\s*true|align_number_right\s*=\s*false
 ValueDefault=false
 
 [Align Keep Extra Space]
@@ -5680,7 +5843,7 @@ 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
+TrueFalse=align_keep_extra_space\s*=\s*true|align_keep_extra_space\s*=\s*false
 ValueDefault=false
 
 [Align Func Params]
@@ -5688,7 +5851,7 @@ 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
+TrueFalse=align_func_params\s*=\s*true|align_func_params\s*=\s*false
 ValueDefault=false
 
 [Align Func Params Span]
@@ -5696,7 +5859,7 @@ 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="
+CallName="align_func_params_span\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5706,7 +5869,7 @@ 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="
+CallName="align_func_params_thresh\s*=\s*"
 MinVal=-1000
 MaxVal=5000
 ValueDefault=0
@@ -5716,7 +5879,7 @@ Category=7
 Description="<html>The gap for aligning function parameter definitions.</html>"
 Enabled=false
 EditorType=numeric
-CallName="align_func_params_gap="
+CallName="align_func_params_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5726,7 +5889,7 @@ 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="
+CallName="align_constr_value_span\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5736,7 +5899,7 @@ 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="
+CallName="align_constr_value_thresh\s*=\s*"
 MinVal=-1000
 MaxVal=5000
 ValueDefault=0
@@ -5746,7 +5909,7 @@ Category=7
 Description="<html>The gap for aligning constructor value.</html>"
 Enabled=false
 EditorType=numeric
-CallName="align_constr_value_gap="
+CallName="align_constr_value_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5756,7 +5919,7 @@ 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
+TrueFalse=align_same_func_call_params\s*=\s*true|align_same_func_call_params\s*=\s*false
 ValueDefault=false
 
 [Align Same Func Call Params Span]
@@ -5764,7 +5927,7 @@ 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="
+CallName="align_same_func_call_params_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -5774,7 +5937,7 @@ 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="
+CallName="align_same_func_call_params_thresh\s*=\s*"
 MinVal=-1000
 MaxVal=5000
 ValueDefault=0
@@ -5784,7 +5947,7 @@ 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="
+CallName="align_var_def_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -5794,7 +5957,7 @@ 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="
+CallName="align_var_def_star_style\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -5804,7 +5967,7 @@ 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="
+CallName="align_var_def_amp_style\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -5814,7 +5977,7 @@ 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="
+CallName="align_var_def_thresh\s*=\s*"
 MinVal=-1000
 MaxVal=5000
 ValueDefault=0
@@ -5824,7 +5987,7 @@ Category=7
 Description="<html>The gap for aligning variable definitions.</html>"
 Enabled=false
 EditorType=numeric
-CallName="align_var_def_gap="
+CallName="align_var_def_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5834,7 +5997,7 @@ 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
+TrueFalse=align_var_def_colon\s*=\s*true|align_var_def_colon\s*=\s*false
 ValueDefault=false
 
 [Align Var Def Colon Gap]
@@ -5842,7 +6005,7 @@ 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="
+CallName="align_var_def_colon_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5852,7 +6015,7 @@ 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
+TrueFalse=align_var_def_attribute\s*=\s*true|align_var_def_attribute\s*=\s*false
 ValueDefault=false
 
 [Align Var Def Inline]
@@ -5860,7 +6023,7 @@ 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
+TrueFalse=align_var_def_inline\s*=\s*true|align_var_def_inline\s*=\s*false
 ValueDefault=false
 
 [Align Assign Span]
@@ -5868,7 +6031,7 @@ 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="
+CallName="align_assign_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -5878,7 +6041,7 @@ 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="
+CallName="align_assign_func_proto_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -5888,7 +6051,7 @@ 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="
+CallName="align_assign_thresh\s*=\s*"
 MinVal=-1000
 MaxVal=5000
 ValueDefault=0
@@ -5898,7 +6061,7 @@ Category=7
 Description="<html>Whether to align on the left most assignment when multiple<br/>definitions are found on the same line.<br/>Depends on 'align_assign_span' and 'align_assign_thresh' settings.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=align_assign_on_multi_var_defs=true|align_assign_on_multi_var_defs=false
+TrueFalse=align_assign_on_multi_var_defs\s*=\s*true|align_assign_on_multi_var_defs\s*=\s*false
 ValueDefault=false
 
 [Align Braced Init List Span]
@@ -5906,7 +6069,7 @@ Category=7
 Description="<html>The span for aligning on '{' in braced init list.<br/><br/>0: Don't align (default).</html>"
 Enabled=false
 EditorType=numeric
-CallName="align_braced_init_list_span="
+CallName="align_braced_init_list_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -5916,7 +6079,7 @@ Category=7
 Description="<html>The threshold for aligning on '{' in braced init list.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
 Enabled=false
 EditorType=numeric
-CallName="align_braced_init_list_thresh="
+CallName="align_braced_init_list_thresh\s*=\s*"
 MinVal=-1000
 MaxVal=5000
 ValueDefault=0
@@ -5926,7 +6089,7 @@ 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="
+CallName="align_assign_decl_func\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -5936,7 +6099,7 @@ 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="
+CallName="align_enum_equ_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -5946,7 +6109,7 @@ 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="
+CallName="align_enum_equ_thresh\s*=\s*"
 MinVal=-1000
 MaxVal=5000
 ValueDefault=0
@@ -5956,7 +6119,7 @@ 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="
+CallName="align_var_class_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -5966,7 +6129,7 @@ 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="
+CallName="align_var_class_thresh\s*=\s*"
 MinVal=-1000
 MaxVal=5000
 ValueDefault=0
@@ -5976,7 +6139,7 @@ Category=7
 Description="<html>The gap for aligning class member definitions.</html>"
 Enabled=false
 EditorType=numeric
-CallName="align_var_class_gap="
+CallName="align_var_class_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5986,7 +6149,7 @@ 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="
+CallName="align_var_struct_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -5996,7 +6159,7 @@ 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="
+CallName="align_var_struct_thresh\s*=\s*"
 MinVal=-1000
 MaxVal=5000
 ValueDefault=0
@@ -6006,7 +6169,7 @@ Category=7
 Description="<html>The gap for aligning struct/union member definitions.</html>"
 Enabled=false
 EditorType=numeric
-CallName="align_var_struct_gap="
+CallName="align_var_struct_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -6016,7 +6179,7 @@ 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="
+CallName="align_struct_init_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -6026,7 +6189,7 @@ 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="
+CallName="align_typedef_span\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -6036,7 +6199,7 @@ 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="
+CallName="align_typedef_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -6046,7 +6209,7 @@ 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="
+CallName="align_typedef_func\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -6056,7 +6219,7 @@ 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="
+CallName="align_typedef_star_style\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -6066,7 +6229,7 @@ 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="
+CallName="align_typedef_amp_style\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -6076,7 +6239,7 @@ 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="
+CallName="align_right_cmt_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -6086,7 +6249,7 @@ 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="
+CallName="align_right_cmt_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -6096,7 +6259,7 @@ 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
+TrueFalse=align_right_cmt_mix\s*=\s*true|align_right_cmt_mix\s*=\s*false
 ValueDefault=false
 
 [Align Right Cmt Same Level]
@@ -6104,7 +6267,7 @@ 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
+TrueFalse=align_right_cmt_same_level\s*=\s*true|align_right_cmt_same_level\s*=\s*false
 ValueDefault=false
 
 [Align Right Cmt At Col]
@@ -6112,7 +6275,7 @@ 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="
+CallName="align_right_cmt_at_col\s*=\s*"
 MinVal=0
 MaxVal=200
 ValueDefault=0
@@ -6122,17 +6285,25 @@ 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="
+CallName="align_func_proto_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
 
+[Align Func Proto Span Ignore Cont Lines]
+Category=7
+Description="<html>Whether to ignore continuation lines when evaluating the number of<br/>new lines for the function prototype alignment's span.<br/><br/>false: continuation lines are part of the newlines count<br/>true:  continuation lines are not counted</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_func_proto_span_ignore_cont_lines\s*=\s*true|align_func_proto_span_ignore_cont_lines\s*=\s*false
+ValueDefault=false
+
 [Align Func Proto Star Style]
 Category=7
 Description="<html>How to consider (or treat) the '*' in the alignment of function prototypes.<br/><br/>0: Part of the type     'void *   foo();' (default)<br/>1: Part of the function '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_func_proto_star_style="
+CallName="align_func_proto_star_style\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -6142,7 +6313,7 @@ Category=7
 Description="<html>How to consider (or treat) the '&amp;' in the alignment of function prototypes.<br/><br/>0: Part of the type     'long &amp;   foo();' (default)<br/>1: Part of the function '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_func_proto_amp_style="
+CallName="align_func_proto_amp_style\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -6152,7 +6323,7 @@ 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="
+CallName="align_func_proto_thresh\s*=\s*"
 MinVal=-1000
 MaxVal=5000
 ValueDefault=0
@@ -6162,7 +6333,7 @@ Category=7
 Description="<html>Minimum gap between the return type and the function name.</html>"
 Enabled=false
 EditorType=numeric
-CallName="align_func_proto_gap="
+CallName="align_func_proto_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -6172,7 +6343,7 @@ 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
+TrueFalse=align_on_operator\s*=\s*true|align_on_operator\s*=\s*false
 ValueDefault=false
 
 [Align Mix Var Proto]
@@ -6180,7 +6351,7 @@ 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
+TrueFalse=align_mix_var_proto\s*=\s*true|align_mix_var_proto\s*=\s*false
 ValueDefault=false
 
 [Align Single Line Func]
@@ -6188,7 +6359,7 @@ 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
+TrueFalse=align_single_line_func\s*=\s*true|align_single_line_func\s*=\s*false
 ValueDefault=false
 
 [Align Single Line Brace]
@@ -6196,7 +6367,7 @@ 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
+TrueFalse=align_single_line_brace\s*=\s*true|align_single_line_brace\s*=\s*false
 ValueDefault=false
 
 [Align Single Line Brace Gap]
@@ -6204,7 +6375,7 @@ Category=7
 Description="<html>Gap for align_single_line_brace.</html>"
 Enabled=false
 EditorType=numeric
-CallName="align_single_line_brace_gap="
+CallName="align_single_line_brace_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -6214,25 +6385,37 @@ 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="
+CallName="align_oc_msg_spec_span\s*=\s*"
 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>"
+Description="<html>Whether and how to align backslashes that split a macro onto multiple lines.<br/>This will not work right if the macro contains a multi-line comment.<br/><br/>0: Do nothing (default)<br/>1: Align the backslashes in the column at the end of the longest line<br/>2: Align with the backslash that is farthest to the left, or, if that<br/>   backslash is farther left than the end of the longest line, at the end of<br/>   the longest line<br/>3: Align with the backslash that is farthest to the right</html>"
 Enabled=false
-EditorType=boolean
-TrueFalse=align_nl_cont=true|align_nl_cont=false
-ValueDefault=false
+EditorType=numeric
+CallName="align_nl_cont\s*=\s*"
+MinVal=0
+MaxVal=3
+ValueDefault=0
+
+[Align Nl Cont Spaces]
+Category=7
+Description="<html>The minimum number of spaces between the end of a line and its continuation<br/>backslash. Requires align_nl_cont.<br/><br/>Default: 1</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_nl_cont_spaces\s*=\s*"
+MinVal=0
+MaxVal=16
+ValueDefault=1
 
 [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
+TrueFalse=align_pp_define_together\s*=\s*true|align_pp_define_together\s*=\s*false
 ValueDefault=false
 
 [Align Pp Define Span]
@@ -6240,7 +6423,7 @@ 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="
+CallName="align_pp_define_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -6250,7 +6433,7 @@ 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="
+CallName="align_pp_define_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -6260,7 +6443,7 @@ 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
+TrueFalse=align_left_shift\s*=\s*true|align_left_shift\s*=\s*false
 ValueDefault=true
 
 [Align Eigen Comma Init]
@@ -6268,7 +6451,7 @@ 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
+TrueFalse=align_eigen_comma_init\s*=\s*true|align_eigen_comma_init\s*=\s*false
 ValueDefault=false
 
 [Align Asm Colon]
@@ -6276,7 +6459,7 @@ 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
+TrueFalse=align_asm_colon\s*=\s*true|align_asm_colon\s*=\s*false
 ValueDefault=false
 
 [Align Oc Msg Colon Span]
@@ -6284,7 +6467,7 @@ 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="
+CallName="align_oc_msg_colon_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -6294,7 +6477,7 @@ 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
+TrueFalse=align_oc_msg_colon_first\s*=\s*true|align_oc_msg_colon_first\s*=\s*false
 ValueDefault=false
 
 [Align Oc Decl Colon]
@@ -6302,7 +6485,7 @@ 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
+TrueFalse=align_oc_decl_colon\s*=\s*true|align_oc_decl_colon\s*=\s*false
 ValueDefault=false
 
 [Align Oc Msg Colon Xcode Like]
@@ -6310,7 +6493,7 @@ 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/>alignment)</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=align_oc_msg_colon_xcode_like=true|align_oc_msg_colon_xcode_like=false
+TrueFalse=align_oc_msg_colon_xcode_like\s*=\s*true|align_oc_msg_colon_xcode_like\s*=\s*false
 ValueDefault=false
 
 [Cmt Width]
@@ -6318,7 +6501,7 @@ Category=8
 Description="<html>Try to wrap comments at N columns.</html>"
 Enabled=false
 EditorType=numeric
-CallName="cmt_width="
+CallName="cmt_width\s*=\s*"
 MinVal=0
 MaxVal=256
 ValueDefault=0
@@ -6328,7 +6511,7 @@ 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="
+CallName="cmt_reflow_mode\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -6337,7 +6520,7 @@ ValueDefault=0
 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=
+CallName=cmt_reflow_fold_regex_file\s*=\s*
 EditorType=string
 ValueDefault=
 
@@ -6346,7 +6529,7 @@ 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
+TrueFalse=cmt_reflow_indent_to_paragraph_start\s*=\s*true|cmt_reflow_indent_to_paragraph_start\s*=\s*false
 ValueDefault=false
 
 [Cmt Convert Tab To Spaces]
@@ -6354,7 +6537,7 @@ 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
+TrueFalse=cmt_convert_tab_to_spaces\s*=\s*true|cmt_convert_tab_to_spaces\s*=\s*false
 ValueDefault=false
 
 [Cmt Indent Multi]
@@ -6362,7 +6545,7 @@ 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
+TrueFalse=cmt_indent_multi\s*=\s*true|cmt_indent_multi\s*=\s*false
 ValueDefault=true
 
 [Cmt Align Doxygen Javadoc Tags]
@@ -6370,7 +6553,7 @@ 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
+TrueFalse=cmt_align_doxygen_javadoc_tags\s*=\s*true|cmt_align_doxygen_javadoc_tags\s*=\s*false
 ValueDefault=false
 
 [Cmt Sp Before Doxygen Javadoc Tags]
@@ -6378,7 +6561,7 @@ 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="
+CallName="cmt_sp_before_doxygen_javadoc_tags\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=1
@@ -6388,7 +6571,7 @@ Category=8
 Description="<html>Whether to change trailing, single-line c-comments into cpp-comments.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=cmt_trailing_single_line_c_to_cpp=true|cmt_trailing_single_line_c_to_cpp=false
+TrueFalse=cmt_trailing_single_line_c_to_cpp\s*=\s*true|cmt_trailing_single_line_c_to_cpp\s*=\s*false
 ValueDefault=false
 
 [Cmt C Group]
@@ -6396,7 +6579,7 @@ 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
+TrueFalse=cmt_c_group\s*=\s*true|cmt_c_group\s*=\s*false
 ValueDefault=false
 
 [Cmt C Nl Start]
@@ -6404,7 +6587,7 @@ 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
+TrueFalse=cmt_c_nl_start\s*=\s*true|cmt_c_nl_start\s*=\s*false
 ValueDefault=false
 
 [Cmt C Nl End]
@@ -6412,7 +6595,7 @@ 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
+TrueFalse=cmt_c_nl_end\s*=\s*true|cmt_c_nl_end\s*=\s*false
 ValueDefault=false
 
 [Cmt Cpp To C]
@@ -6420,7 +6603,7 @@ 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
+TrueFalse=cmt_cpp_to_c\s*=\s*true|cmt_cpp_to_c\s*=\s*false
 ValueDefault=false
 
 [Cmt Cpp Group]
@@ -6428,7 +6611,7 @@ 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
+TrueFalse=cmt_cpp_group\s*=\s*true|cmt_cpp_group\s*=\s*false
 ValueDefault=false
 
 [Cmt Cpp Nl Start]
@@ -6436,7 +6619,7 @@ 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
+TrueFalse=cmt_cpp_nl_start\s*=\s*true|cmt_cpp_nl_start\s*=\s*false
 ValueDefault=false
 
 [Cmt Cpp Nl End]
@@ -6444,7 +6627,7 @@ 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
+TrueFalse=cmt_cpp_nl_end\s*=\s*true|cmt_cpp_nl_end\s*=\s*false
 ValueDefault=false
 
 [Cmt Star Cont]
@@ -6452,7 +6635,7 @@ 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
+TrueFalse=cmt_star_cont\s*=\s*true|cmt_star_cont\s*=\s*false
 ValueDefault=false
 
 [Cmt Sp Before Star Cont]
@@ -6460,7 +6643,7 @@ 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="
+CallName="cmt_sp_before_star_cont\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -6470,7 +6653,7 @@ 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="
+CallName="cmt_sp_after_star_cont\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -6480,7 +6663,7 @@ 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
+TrueFalse=cmt_multi_check_last\s*=\s*true|cmt_multi_check_last\s*=\s*false
 ValueDefault=true
 
 [Cmt Multi First Len Minimum]
@@ -6488,7 +6671,7 @@ 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="
+CallName="cmt_multi_first_len_minimum\s*=\s*"
 MinVal=1
 MaxVal=20
 ValueDefault=4
@@ -6497,7 +6680,7 @@ ValueDefault=4
 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=
+CallName=cmt_insert_file_header\s*=\s*
 EditorType=string
 ValueDefault=
 
@@ -6505,7 +6688,7 @@ ValueDefault=
 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=
+CallName=cmt_insert_file_footer\s*=\s*
 EditorType=string
 ValueDefault=
 
@@ -6513,7 +6696,7 @@ ValueDefault=
 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=
+CallName=cmt_insert_func_header\s*=\s*
 EditorType=string
 ValueDefault=
 
@@ -6521,7 +6704,7 @@ ValueDefault=
 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=
+CallName=cmt_insert_class_header\s*=\s*
 EditorType=string
 ValueDefault=
 
@@ -6529,7 +6712,7 @@ ValueDefault=
 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=
+CallName=cmt_insert_oc_msg_header\s*=\s*
 EditorType=string
 ValueDefault=
 
@@ -6538,7 +6721,7 @@ 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
+TrueFalse=cmt_insert_before_preproc\s*=\s*true|cmt_insert_before_preproc\s*=\s*false
 ValueDefault=false
 
 [Cmt Insert Before Inlines]
@@ -6546,7 +6729,7 @@ 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
+TrueFalse=cmt_insert_before_inlines\s*=\s*true|cmt_insert_before_inlines\s*=\s*false
 ValueDefault=true
 
 [Cmt Insert Before Ctor Dtor]
@@ -6554,7 +6737,7 @@ 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
+TrueFalse=cmt_insert_before_ctor_dtor\s*=\s*true|cmt_insert_before_ctor_dtor\s*=\s*false
 ValueDefault=false
 
 [Mod Full Brace Do]
@@ -6562,7 +6745,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|mod_full_brace_do=not_defined
+Choices=mod_full_brace_do\s*=\s*ignore|mod_full_brace_do\s*=\s*add|mod_full_brace_do\s*=\s*remove|mod_full_brace_do\s*=\s*force|mod_full_brace_do\s*=\s*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
 
@@ -6571,7 +6754,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|mod_full_brace_for=not_defined
+Choices=mod_full_brace_for\s*=\s*ignore|mod_full_brace_for\s*=\s*add|mod_full_brace_for\s*=\s*remove|mod_full_brace_for\s*=\s*force|mod_full_brace_for\s*=\s*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
 
@@ -6580,7 +6763,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|mod_full_brace_function=not_defined
+Choices=mod_full_brace_function\s*=\s*ignore|mod_full_brace_function\s*=\s*add|mod_full_brace_function\s*=\s*remove|mod_full_brace_function\s*=\s*force|mod_full_brace_function\s*=\s*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
 
@@ -6589,7 +6772,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|mod_full_brace_if=not_defined
+Choices=mod_full_brace_if\s*=\s*ignore|mod_full_brace_if\s*=\s*add|mod_full_brace_if\s*=\s*remove|mod_full_brace_if\s*=\s*force|mod_full_brace_if\s*=\s*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
 
@@ -6598,7 +6781,7 @@ 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. Overrides mod_full_brace_if.<br/><br/>0: Don't override mod_full_brace_if<br/>1: Add braces to all blocks if any block needs braces and remove braces if<br/>   they can be removed from all blocks<br/>2: Add braces to all blocks if any block already has braces, regardless of<br/>   whether it needs them<br/>3: Add braces to all blocks if any block needs braces and remove braces if<br/>   they can be removed from all blocks, except if all blocks have braces<br/>   despite none needing them</html>"
 Enabled=false
 EditorType=numeric
-CallName="mod_full_brace_if_chain="
+CallName="mod_full_brace_if_chain\s*=\s*"
 MinVal=0
 MaxVal=3
 ValueDefault=0
@@ -6608,7 +6791,7 @@ 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
+TrueFalse=mod_full_brace_if_chain_only\s*=\s*true|mod_full_brace_if_chain_only\s*=\s*false
 ValueDefault=false
 
 [Mod Full Brace While]
@@ -6616,7 +6799,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|mod_full_brace_while=not_defined
+Choices=mod_full_brace_while\s*=\s*ignore|mod_full_brace_while\s*=\s*add|mod_full_brace_while\s*=\s*remove|mod_full_brace_while\s*=\s*force|mod_full_brace_while\s*=\s*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
 
@@ -6625,7 +6808,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|mod_full_brace_using=not_defined
+Choices=mod_full_brace_using\s*=\s*ignore|mod_full_brace_using\s*=\s*add|mod_full_brace_using\s*=\s*remove|mod_full_brace_using\s*=\s*force|mod_full_brace_using\s*=\s*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
 
@@ -6634,7 +6817,7 @@ Category=9
 Description="<html>Don't remove braces around statements that span N newlines</html>"
 Enabled=false
 EditorType=numeric
-CallName="mod_full_brace_nl="
+CallName="mod_full_brace_nl\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -6644,7 +6827,7 @@ 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
+TrueFalse=mod_full_brace_nl_block_rem_mlcond\s*=\s*true|mod_full_brace_nl_block_rem_mlcond\s*=\s*false
 ValueDefault=false
 
 [Mod Paren On Return]
@@ -6652,7 +6835,7 @@ Category=9
 Description="<html>Add or remove unnecessary parentheses 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
+Choices=mod_paren_on_return\s*=\s*ignore|mod_paren_on_return\s*=\s*add|mod_paren_on_return\s*=\s*remove|mod_paren_on_return\s*=\s*force|mod_paren_on_return\s*=\s*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
 
@@ -6661,7 +6844,7 @@ Category=9
 Description="<html>Add or remove unnecessary parentheses on 'throw' statement.</html>"
 Enabled=false
 EditorType=multiple
-Choices=mod_paren_on_throw=ignore|mod_paren_on_throw=add|mod_paren_on_throw=remove|mod_paren_on_throw=force|mod_paren_on_throw=not_defined
+Choices=mod_paren_on_throw\s*=\s*ignore|mod_paren_on_throw\s*=\s*add|mod_paren_on_throw\s*=\s*remove|mod_paren_on_throw\s*=\s*force|mod_paren_on_throw\s*=\s*not_defined
 ChoicesReadable="Ignore Mod Paren On Throw|Add Mod Paren On Throw|Remove Mod Paren On Throw|Force Mod Paren On Throw"
 ValueDefault=ignore
 
@@ -6670,7 +6853,7 @@ 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
+TrueFalse=mod_pawn_semicolon\s*=\s*true|mod_pawn_semicolon\s*=\s*false
 ValueDefault=false
 
 [Mod Full Paren If Bool]
@@ -6678,7 +6861,7 @@ 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
+TrueFalse=mod_full_paren_if_bool\s*=\s*true|mod_full_paren_if_bool\s*=\s*false
 ValueDefault=false
 
 [Mod Full Paren Assign Bool]
@@ -6686,7 +6869,7 @@ Category=9
 Description="<html>Whether to fully parenthesize Boolean expressions after '='<br/>statement, as in 'x = a &amp;&amp; b &gt; c;' =&gt; 'x = (a &amp;&amp; (b &gt; c));'.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=mod_full_paren_assign_bool=true|mod_full_paren_assign_bool=false
+TrueFalse=mod_full_paren_assign_bool\s*=\s*true|mod_full_paren_assign_bool\s*=\s*false
 ValueDefault=false
 
 [Mod Full Paren Return Bool]
@@ -6694,7 +6877,7 @@ Category=9
 Description="<html>Whether to fully parenthesize Boolean expressions after '='<br/>statement, as in 'return  a &amp;&amp; b &gt; c;' =&gt; 'return (a &amp;&amp; (b &gt; c));'.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=mod_full_paren_return_bool=true|mod_full_paren_return_bool=false
+TrueFalse=mod_full_paren_return_bool\s*=\s*true|mod_full_paren_return_bool\s*=\s*false
 ValueDefault=false
 
 [Mod Remove Extra Semicolon]
@@ -6702,7 +6885,7 @@ 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
+TrueFalse=mod_remove_extra_semicolon\s*=\s*true|mod_remove_extra_semicolon\s*=\s*false
 ValueDefault=false
 
 [Mod Remove Duplicate Include]
@@ -6710,7 +6893,15 @@ Category=9
 Description="<html>Whether to remove duplicate include.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=mod_remove_duplicate_include=true|mod_remove_duplicate_include=false
+TrueFalse=mod_remove_duplicate_include\s*=\s*true|mod_remove_duplicate_include\s*=\s*false
+ValueDefault=false
+
+[Mod Add Force C Closebrace Comment]
+Category=9
+Description="<html>the following options (mod_XX_closebrace_comment) use different comment,<br/>depending of the setting of the next option.<br/>false: Use the c comment (default)<br/>true : Use the cpp comment</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_add_force_c_closebrace_comment\s*=\s*true|mod_add_force_c_closebrace_comment\s*=\s*false
 ValueDefault=false
 
 [Mod Add Long Function Closebrace Comment]
@@ -6718,7 +6909,7 @@ 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="
+CallName="mod_add_long_function_closebrace_comment\s*=\s*"
 MinVal=0
 MaxVal=255
 ValueDefault=0
@@ -6728,7 +6919,7 @@ 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="
+CallName="mod_add_long_namespace_closebrace_comment\s*=\s*"
 MinVal=0
 MaxVal=255
 ValueDefault=0
@@ -6738,7 +6929,7 @@ 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="
+CallName="mod_add_long_class_closebrace_comment\s*=\s*"
 MinVal=0
 MaxVal=255
 ValueDefault=0
@@ -6748,7 +6939,7 @@ 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="
+CallName="mod_add_long_switch_closebrace_comment\s*=\s*"
 MinVal=0
 MaxVal=255
 ValueDefault=0
@@ -6758,7 +6949,7 @@ 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="
+CallName="mod_add_long_ifdef_endif_comment\s*=\s*"
 MinVal=0
 MaxVal=255
 ValueDefault=0
@@ -6768,7 +6959,7 @@ 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="
+CallName="mod_add_long_ifdef_else_comment\s*=\s*"
 MinVal=0
 MaxVal=255
 ValueDefault=0
@@ -6778,7 +6969,7 @@ 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
+TrueFalse=mod_sort_case_sensitive\s*=\s*true|mod_sort_case_sensitive\s*=\s*false
 ValueDefault=false
 
 [Mod Sort Import]
@@ -6786,7 +6977,7 @@ 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
+TrueFalse=mod_sort_import\s*=\s*true|mod_sort_import\s*=\s*false
 ValueDefault=false
 
 [Mod Sort Using]
@@ -6794,7 +6985,7 @@ 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
+TrueFalse=mod_sort_using\s*=\s*true|mod_sort_using\s*=\s*false
 ValueDefault=false
 
 [Mod Sort Include]
@@ -6802,7 +6993,7 @@ 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
+TrueFalse=mod_sort_include\s*=\s*true|mod_sort_include\s*=\s*false
 ValueDefault=false
 
 [Mod Sort Incl Import Prioritize Filename]
@@ -6810,7 +7001,7 @@ 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
+TrueFalse=mod_sort_incl_import_prioritize_filename\s*=\s*true|mod_sort_incl_import_prioritize_filename\s*=\s*false
 ValueDefault=false
 
 [Mod Sort Incl Import Prioritize Extensionless]
@@ -6818,7 +7009,7 @@ 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
+TrueFalse=mod_sort_incl_import_prioritize_extensionless\s*=\s*true|mod_sort_incl_import_prioritize_extensionless\s*=\s*false
 ValueDefault=false
 
 [Mod Sort Incl Import Prioritize Angle Over Quotes]
@@ -6826,7 +7017,7 @@ 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
+TrueFalse=mod_sort_incl_import_prioritize_angle_over_quotes\s*=\s*true|mod_sort_incl_import_prioritize_angle_over_quotes\s*=\s*false
 ValueDefault=false
 
 [Mod Sort Incl Import Ignore Extension]
@@ -6834,7 +7025,7 @@ 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
+TrueFalse=mod_sort_incl_import_ignore_extension\s*=\s*true|mod_sort_incl_import_ignore_extension\s*=\s*false
 ValueDefault=false
 
 [Mod Sort Incl Import Grouping Enabled]
@@ -6842,7 +7033,7 @@ 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
+TrueFalse=mod_sort_incl_import_grouping_enabled\s*=\s*true|mod_sort_incl_import_grouping_enabled\s*=\s*false
 ValueDefault=false
 
 [Mod Move Case Break]
@@ -6850,7 +7041,7 @@ 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
+TrueFalse=mod_move_case_break\s*=\s*true|mod_move_case_break\s*=\s*false
 ValueDefault=false
 
 [Mod Move Case Return]
@@ -6858,7 +7049,7 @@ Category=9
 Description="<html>Whether to move a 'return' that appears after a fully braced 'case' before<br/>the close brace, as in 'case X: { ... } return;' =&gt; 'case X: { ... return; }'.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=mod_move_case_return=true|mod_move_case_return=false
+TrueFalse=mod_move_case_return\s*=\s*true|mod_move_case_return\s*=\s*false
 ValueDefault=false
 
 [Mod Case Brace]
@@ -6866,7 +7057,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|mod_case_brace=not_defined
+Choices=mod_case_brace\s*=\s*ignore|mod_case_brace\s*=\s*add|mod_case_brace\s*=\s*remove|mod_case_brace\s*=\s*force|mod_case_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Mod Case Brace|Add Mod Case Brace|Remove Mod Case Brace|Force Mod Case Brace"
 ValueDefault=ignore
 
@@ -6875,7 +7066,7 @@ 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
+TrueFalse=mod_remove_empty_return\s*=\s*true|mod_remove_empty_return\s*=\s*false
 ValueDefault=false
 
 [Mod Enum Last Comma]
@@ -6883,7 +7074,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|mod_enum_last_comma=not_defined
+Choices=mod_enum_last_comma\s*=\s*ignore|mod_enum_last_comma\s*=\s*add|mod_enum_last_comma\s*=\s*remove|mod_enum_last_comma\s*=\s*force|mod_enum_last_comma\s*=\s*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
 
@@ -6892,7 +7083,7 @@ Category=9
 Description="<html>Syntax to use for infinite loops.<br/><br/>0: Leave syntax alone (default)<br/>1: Rewrite as `for(;;)`<br/>2: Rewrite as `while(true)`<br/>3: Rewrite as `do`...`while(true);`<br/>4: Rewrite as `while(1)`<br/>5: Rewrite as `do`...`while(1);`<br/><br/>Infinite loops that do not already match one of these syntaxes are ignored.<br/>Other options that affect loop formatting will be applied after transforming<br/>the syntax.</html>"
 Enabled=false
 EditorType=numeric
-CallName="mod_infinite_loop="
+CallName="mod_infinite_loop\s*=\s*"
 MinVal=0
 MaxVal=5
 ValueDefault=0
@@ -6902,7 +7093,7 @@ Category=9
 Description="<html>Add or remove the 'int' keyword in 'int short'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=mod_int_short=ignore|mod_int_short=add|mod_int_short=remove|mod_int_short=force|mod_int_short=not_defined
+Choices=mod_int_short\s*=\s*ignore|mod_int_short\s*=\s*add|mod_int_short\s*=\s*remove|mod_int_short\s*=\s*force|mod_int_short\s*=\s*not_defined
 ChoicesReadable="Ignore Mod Int Short|Add Mod Int Short|Remove Mod Int Short|Force Mod Int Short"
 ValueDefault=ignore
 
@@ -6911,7 +7102,7 @@ Category=9
 Description="<html>Add or remove the 'int' keyword in 'short int'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=mod_short_int=ignore|mod_short_int=add|mod_short_int=remove|mod_short_int=force|mod_short_int=not_defined
+Choices=mod_short_int\s*=\s*ignore|mod_short_int\s*=\s*add|mod_short_int\s*=\s*remove|mod_short_int\s*=\s*force|mod_short_int\s*=\s*not_defined
 ChoicesReadable="Ignore Mod Short Int|Add Mod Short Int|Remove Mod Short Int|Force Mod Short Int"
 ValueDefault=ignore
 
@@ -6920,7 +7111,7 @@ Category=9
 Description="<html>Add or remove the 'int' keyword in 'int long'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=mod_int_long=ignore|mod_int_long=add|mod_int_long=remove|mod_int_long=force|mod_int_long=not_defined
+Choices=mod_int_long\s*=\s*ignore|mod_int_long\s*=\s*add|mod_int_long\s*=\s*remove|mod_int_long\s*=\s*force|mod_int_long\s*=\s*not_defined
 ChoicesReadable="Ignore Mod Int Long|Add Mod Int Long|Remove Mod Int Long|Force Mod Int Long"
 ValueDefault=ignore
 
@@ -6929,7 +7120,7 @@ Category=9
 Description="<html>Add or remove the 'int' keyword in 'long int'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=mod_long_int=ignore|mod_long_int=add|mod_long_int=remove|mod_long_int=force|mod_long_int=not_defined
+Choices=mod_long_int\s*=\s*ignore|mod_long_int\s*=\s*add|mod_long_int\s*=\s*remove|mod_long_int\s*=\s*force|mod_long_int\s*=\s*not_defined
 ChoicesReadable="Ignore Mod Long Int|Add Mod Long Int|Remove Mod Long Int|Force Mod Long Int"
 ValueDefault=ignore
 
@@ -6938,7 +7129,7 @@ Category=9
 Description="<html>Add or remove the 'int' keyword in 'int signed'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=mod_int_signed=ignore|mod_int_signed=add|mod_int_signed=remove|mod_int_signed=force|mod_int_signed=not_defined
+Choices=mod_int_signed\s*=\s*ignore|mod_int_signed\s*=\s*add|mod_int_signed\s*=\s*remove|mod_int_signed\s*=\s*force|mod_int_signed\s*=\s*not_defined
 ChoicesReadable="Ignore Mod Int Signed|Add Mod Int Signed|Remove Mod Int Signed|Force Mod Int Signed"
 ValueDefault=ignore
 
@@ -6947,7 +7138,7 @@ Category=9
 Description="<html>Add or remove the 'int' keyword in 'signed int'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=mod_signed_int=ignore|mod_signed_int=add|mod_signed_int=remove|mod_signed_int=force|mod_signed_int=not_defined
+Choices=mod_signed_int\s*=\s*ignore|mod_signed_int\s*=\s*add|mod_signed_int\s*=\s*remove|mod_signed_int\s*=\s*force|mod_signed_int\s*=\s*not_defined
 ChoicesReadable="Ignore Mod Signed Int|Add Mod Signed Int|Remove Mod Signed Int|Force Mod Signed Int"
 ValueDefault=ignore
 
@@ -6956,7 +7147,7 @@ Category=9
 Description="<html>Add or remove the 'int' keyword in 'int unsigned'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=mod_int_unsigned=ignore|mod_int_unsigned=add|mod_int_unsigned=remove|mod_int_unsigned=force|mod_int_unsigned=not_defined
+Choices=mod_int_unsigned\s*=\s*ignore|mod_int_unsigned\s*=\s*add|mod_int_unsigned\s*=\s*remove|mod_int_unsigned\s*=\s*force|mod_int_unsigned\s*=\s*not_defined
 ChoicesReadable="Ignore Mod Int Unsigned|Add Mod Int Unsigned|Remove Mod Int Unsigned|Force Mod Int Unsigned"
 ValueDefault=ignore
 
@@ -6965,7 +7156,7 @@ Category=9
 Description="<html>Add or remove the 'int' keyword in 'unsigned int'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=mod_unsigned_int=ignore|mod_unsigned_int=add|mod_unsigned_int=remove|mod_unsigned_int=force|mod_unsigned_int=not_defined
+Choices=mod_unsigned_int\s*=\s*ignore|mod_unsigned_int\s*=\s*add|mod_unsigned_int\s*=\s*remove|mod_unsigned_int\s*=\s*force|mod_unsigned_int\s*=\s*not_defined
 ChoicesReadable="Ignore Mod Unsigned Int|Add Mod Unsigned Int|Remove Mod Unsigned Int|Force Mod Unsigned Int"
 ValueDefault=ignore
 
@@ -6974,7 +7165,7 @@ Category=9
 Description="<html>If there is a situation where mod_int_* and mod_*_int would result in<br/>multiple int keywords, whether to keep the rightmost int (the default) or the<br/>leftmost int.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=mod_int_prefer_int_on_left=true|mod_int_prefer_int_on_left=false
+TrueFalse=mod_int_prefer_int_on_left\s*=\s*true|mod_int_prefer_int_on_left\s*=\s*false
 ValueDefault=false
 
 [Mod Sort Oc Properties]
@@ -6982,7 +7173,7 @@ 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
+TrueFalse=mod_sort_oc_properties\s*=\s*true|mod_sort_oc_properties\s*=\s*false
 ValueDefault=false
 
 [Mod Sort Oc Property Class Weight]
@@ -6990,7 +7181,7 @@ Category=9
 Description="<html>(OC) Weight of a class property modifier.</html>"
 Enabled=false
 EditorType=numeric
-CallName="mod_sort_oc_property_class_weight="
+CallName="mod_sort_oc_property_class_weight\s*=\s*"
 MinVal=
 MaxVal=
 ValueDefault=0
@@ -7000,7 +7191,7 @@ Category=9
 Description="<html>(OC) Weight of 'atomic' and 'nonatomic'.</html>"
 Enabled=false
 EditorType=numeric
-CallName="mod_sort_oc_property_thread_safe_weight="
+CallName="mod_sort_oc_property_thread_safe_weight\s*=\s*"
 MinVal=
 MaxVal=
 ValueDefault=0
@@ -7010,7 +7201,7 @@ Category=9
 Description="<html>(OC) Weight of 'readwrite' when organizing properties.</html>"
 Enabled=false
 EditorType=numeric
-CallName="mod_sort_oc_property_readwrite_weight="
+CallName="mod_sort_oc_property_readwrite_weight\s*=\s*"
 MinVal=
 MaxVal=
 ValueDefault=0
@@ -7020,7 +7211,7 @@ 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="
+CallName="mod_sort_oc_property_reference_weight\s*=\s*"
 MinVal=
 MaxVal=
 ValueDefault=0
@@ -7030,7 +7221,7 @@ 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="
+CallName="mod_sort_oc_property_getter_weight\s*=\s*"
 MinVal=
 MaxVal=
 ValueDefault=0
@@ -7040,7 +7231,7 @@ 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="
+CallName="mod_sort_oc_property_setter_weight\s*=\s*"
 MinVal=
 MaxVal=
 ValueDefault=0
@@ -7050,7 +7241,7 @@ 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="
+CallName="mod_sort_oc_property_nullability_weight\s*=\s*"
 MinVal=
 MaxVal=
 ValueDefault=0
@@ -7060,7 +7251,7 @@ Category=10
 Description="<html>How to use tabs when indenting preprocessor code.<br/><br/>-1: Use 'indent_with_tabs' setting (default)<br/> 0: Spaces only<br/> 1: Indent with tabs to brace level, align with spaces<br/> 2: Indent and align with tabs, using spaces when not on a tabstop<br/><br/>Default: -1</html>"
 Enabled=false
 EditorType=numeric
-CallName="pp_indent_with_tabs="
+CallName="pp_indent_with_tabs\s*=\s*"
 MinVal=-1
 MaxVal=2
 ValueDefault=-1
@@ -7070,7 +7261,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|pp_indent=not_defined
+Choices=pp_indent\s*=\s*ignore|pp_indent\s*=\s*add|pp_indent\s*=\s*remove|pp_indent\s*=\s*force|pp_indent\s*=\s*not_defined
 ChoicesReadable="Ignore Pp Indent|Add Pp Indent|Remove Pp Indent|Force Pp Indent"
 ValueDefault=ignore
 
@@ -7079,7 +7270,7 @@ 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
+TrueFalse=pp_indent_at_level\s*=\s*true|pp_indent_at_level\s*=\s*false
 ValueDefault=false
 
 [Pp Indent At Level0]
@@ -7087,7 +7278,7 @@ Category=10
 Description="<html>Whether to indent #if/#else/#endif at the parenthesis level if the brace<br/>level is 0. If false, these are indented from column 1.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=pp_indent_at_level0=true|pp_indent_at_level0=false
+TrueFalse=pp_indent_at_level0\s*=\s*true|pp_indent_at_level0\s*=\s*false
 ValueDefault=false
 
 [Pp Indent Count]
@@ -7095,7 +7286,7 @@ 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="
+CallName="pp_indent_count\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=1
@@ -7105,7 +7296,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_after=ignore|pp_space_after=add|pp_space_after=remove|pp_space_after=force|pp_space_after=not_defined
+Choices=pp_space_after\s*=\s*ignore|pp_space_after\s*=\s*add|pp_space_after\s*=\s*remove|pp_space_after\s*=\s*force|pp_space_after\s*=\s*not_defined
 ChoicesReadable="Ignore Pp Space After|Add Pp Space After|Remove Pp Space After|Force Pp Space After"
 ValueDefault=ignore
 
@@ -7114,7 +7305,7 @@ Category=10
 Description="<html>Sets the number of spaces per level added with pp_space_after.</html>"
 Enabled=false
 EditorType=numeric
-CallName="pp_space_count="
+CallName="pp_space_count\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -7124,7 +7315,7 @@ 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="
+CallName="pp_indent_region\s*=\s*"
 MinVal=-16
 MaxVal=16
 ValueDefault=0
@@ -7134,7 +7325,7 @@ 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
+TrueFalse=pp_region_indent_code\s*=\s*true|pp_region_indent_code\s*=\s*false
 ValueDefault=false
 
 [Pp Indent If]
@@ -7142,7 +7333,7 @@ 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="
+CallName="pp_indent_if\s*=\s*"
 MinVal=-16
 MaxVal=16
 ValueDefault=0
@@ -7152,7 +7343,7 @@ 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
+TrueFalse=pp_if_indent_code\s*=\s*true|pp_if_indent_code\s*=\s*false
 ValueDefault=false
 
 [Pp Indent In Guard]
@@ -7160,7 +7351,7 @@ Category=10
 Description="<html>Whether to indent the body of an #if that encompasses all the code in the file.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=pp_indent_in_guard=true|pp_indent_in_guard=false
+TrueFalse=pp_indent_in_guard\s*=\s*true|pp_indent_in_guard\s*=\s*false
 ValueDefault=false
 
 [Pp Define At Level]
@@ -7168,7 +7359,7 @@ 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
+TrueFalse=pp_define_at_level\s*=\s*true|pp_define_at_level\s*=\s*false
 ValueDefault=false
 
 [Pp Include At Level]
@@ -7176,7 +7367,7 @@ Category=10
 Description="<html>Whether to indent '#include' at the brace level.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=pp_include_at_level=true|pp_include_at_level=false
+TrueFalse=pp_include_at_level\s*=\s*true|pp_include_at_level\s*=\s*false
 ValueDefault=false
 
 [Pp Ignore Define Body]
@@ -7184,7 +7375,7 @@ 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
+TrueFalse=pp_ignore_define_body\s*=\s*true|pp_ignore_define_body\s*=\s*false
 ValueDefault=false
 
 [Pp Multiline Define Body Indent]
@@ -7192,7 +7383,7 @@ Category=10
 Description="<html>An offset value that controls the indentation of the body of a multiline #define.<br/>'body' refers to all the lines of a multiline #define except the first line.<br/>Requires 'pp_ignore_define_body = false'.<br/><br/> &lt;0: Absolute column: the body indentation starts off at the specified column<br/>     (ex. -3 ==&gt; the body is indented starting from column 3)<br/>&gt;=0: Relative to the column of the '#' of '#define'<br/>     (ex.  3 ==&gt; the body is indented starting 3 columns at the right of '#')<br/><br/>Default: 8</html>"
 Enabled=false
 EditorType=numeric
-CallName="pp_multiline_define_body_indent="
+CallName="pp_multiline_define_body_indent\s*=\s*"
 MinVal=-32
 MaxVal=32
 ValueDefault=8
@@ -7202,7 +7393,7 @@ Category=10
 Description="<html>Whether to indent case statements between #if, #else, and #endif.<br/>Only applies to the indent of the preprocessor 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
+TrueFalse=pp_indent_case\s*=\s*true|pp_indent_case\s*=\s*false
 ValueDefault=true
 
 [Pp Indent Func Def]
@@ -7210,7 +7401,7 @@ Category=10
 Description="<html>Whether to indent whole function definitions between #if, #else, and #endif.<br/>Only applies to the indent of the preprocessor 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
+TrueFalse=pp_indent_func_def\s*=\s*true|pp_indent_func_def\s*=\s*false
 ValueDefault=true
 
 [Pp Indent Extern]
@@ -7218,7 +7409,7 @@ Category=10
 Description="<html>Whether to indent extern C blocks between #if, #else, and #endif.<br/>Only applies to the indent of the preprocessor 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
+TrueFalse=pp_indent_extern\s*=\s*true|pp_indent_extern\s*=\s*false
 ValueDefault=true
 
 [Pp Indent Brace]
@@ -7226,7 +7417,7 @@ Category=10
 Description="<html>How to indent braces directly inside #if, #else, and #endif.<br/>Requires pp_if_indent_code=true and only applies to the indent of the<br/>preprocessor that the braces are directly inside of.<br/> 0: No extra indent<br/> 1: Indent by one level<br/>-1: Preserve original indentation<br/><br/>Default: 1</html>"
 Enabled=false
 EditorType=numeric
-CallName="pp_indent_brace="
+CallName="pp_indent_brace\s*=\s*"
 MinVal=-1
 MaxVal=1
 ValueDefault=1
@@ -7236,14 +7427,14 @@ Category=10
 Description="<html>Whether to print warning messages for unbalanced #if and #else blocks.<br/>This will print a message in the following cases:<br/>- if an #ifdef block ends on a different indent level than<br/>  where it started from. Example:<br/><br/>   #ifdef TEST<br/>     int i;<br/>     {<br/>       int j;<br/>   #endif<br/><br/>- an #elif/#else block ends on a different indent level than<br/>  the corresponding #ifdef block. Example:<br/><br/>   #ifdef TEST<br/>       int i;<br/>   #else<br/>       }<br/>     int j;<br/>   #endif</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=pp_warn_unbalanced_if=true|pp_warn_unbalanced_if=false
+TrueFalse=pp_warn_unbalanced_if\s*=\s*true|pp_warn_unbalanced_if\s*=\s*false
 ValueDefault=false
 
 [Include Category 0]
 Category=11
 Description="<html>The regex for include category with priority 0.</html>"
 Enabled=false
-CallName=include_category_0=
+CallName=include_category_0\s*=\s*
 EditorType=string
 ValueDefault=
 
@@ -7251,7 +7442,7 @@ ValueDefault=
 Category=11
 Description="<html>The regex for include category with priority 1.</html>"
 Enabled=false
-CallName=include_category_1=
+CallName=include_category_1\s*=\s*
 EditorType=string
 ValueDefault=
 
@@ -7259,7 +7450,7 @@ ValueDefault=
 Category=11
 Description="<html>The regex for include category with priority 2.</html>"
 Enabled=false
-CallName=include_category_2=
+CallName=include_category_2\s*=\s*
 EditorType=string
 ValueDefault=
 
@@ -7268,7 +7459,7 @@ 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
+TrueFalse=use_indent_func_call_param\s*=\s*true|use_indent_func_call_param\s*=\s*false
 ValueDefault=true
 
 [Use Indent Continue Only Once]
@@ -7276,7 +7467,7 @@ 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)<br/><br/>Requires indent_ignore_first_continue=false.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=use_indent_continue_only_once=true|use_indent_continue_only_once=false
+TrueFalse=use_indent_continue_only_once\s*=\s*true|use_indent_continue_only_once\s*=\s*false
 ValueDefault=false
 
 [Indent Cpp Lambda Only Once]
@@ -7284,7 +7475,7 @@ Category=12
 Description="<html>The indentation can be:<br/>- after the assignment, at the '[' character<br/>- at the beginning of the lambda body<br/><br/>true:  indentation will be at the beginning of the lambda body<br/>false: indentation will be after the assignment (default)</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_cpp_lambda_only_once=true|indent_cpp_lambda_only_once=false
+TrueFalse=indent_cpp_lambda_only_once\s*=\s*true|indent_cpp_lambda_only_once\s*=\s*false
 ValueDefault=false
 
 [Use Sp After Angle Always]
@@ -7292,7 +7483,7 @@ 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
+TrueFalse=use_sp_after_angle_always\s*=\s*true|use_sp_after_angle_always\s*=\s*false
 ValueDefault=false
 
 [Use Options Overriding For Qt Macros]
@@ -7300,7 +7491,7 @@ 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
+TrueFalse=use_options_overriding_for_qt_macros\s*=\s*true|use_options_overriding_for_qt_macros\s*=\s*false
 ValueDefault=true
 
 [Use Form Feed No More As Whitespace Character]
@@ -7308,7 +7499,7 @@ 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
+TrueFalse=use_form_feed_no_more_as_whitespace_character\s*=\s*true|use_form_feed_no_more_as_whitespace_character\s*=\s*false
 ValueDefault=false
 
 [Warn Level Tabs Found In Verbatim String Literals]
@@ -7316,7 +7507,7 @@ 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="
+CallName="warn_level_tabs_found_in_verbatim_string_literals\s*=\s*"
 MinVal=1
 MaxVal=3
 ValueDefault=2
@@ -7326,7 +7517,7 @@ 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="
+CallName="debug_max_number_of_loops\s*=\s*"
 MinVal=
 MaxVal=
 ValueDefault=0
@@ -7336,7 +7527,7 @@ 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="
+CallName="debug_line_number_to_protocol\s*=\s*"
 MinVal=
 MaxVal=
 ValueDefault=0
@@ -7346,7 +7537,7 @@ 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="
+CallName="debug_timeout\s*=\s*"
 MinVal=
 MaxVal=
 ValueDefault=0
@@ -7356,7 +7547,7 @@ 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="
+CallName="debug_truncate\s*=\s*"
 MinVal=0
 MaxVal=960
 ValueDefault=0
@@ -7366,7 +7557,7 @@ Category=13
 Description="<html>sort (or not) the tracking info.<br/><br/>Default: true</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=debug_sort_the_tracks=true|debug_sort_the_tracks=false
+TrueFalse=debug_sort_the_tracks\s*=\s*true|debug_sort_the_tracks\s*=\s*false
 ValueDefault=true
 
 [Debug Decode The Flags]
@@ -7374,13 +7565,21 @@ Category=13
 Description="<html>decode (or not) the flags as a new line.<br/>only if the -p option is set.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=debug_decode_the_flags=true|debug_decode_the_flags=false
+TrueFalse=debug_decode_the_flags\s*=\s*true|debug_decode_the_flags\s*=\s*false
 ValueDefault=false
 
+[Debug Use The Exit Function Pop]
+Category=13
+Description="<html>use (or not) the exit(EX_SOFTWARE) function.<br/><br/>Default: true</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=debug_use_the_exit_function_pop\s*=\s*true|debug_use_the_exit_function_pop\s*=\s*false
+ValueDefault=true
+
 [Set Numbering For Html Output]
 Category=13
 Description="<html>insert the number of the line at the beginning of each line</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=set_numbering_for_html_output=true|set_numbering_for_html_output=false
+TrueFalse=set_numbering_for_html_output\s*=\s*true|set_numbering_for_html_output\s*=\s*false
 ValueDefault=false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/uncrust-files.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/uncrust-files.sh
index 3e1d09b3..3e1d09b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/uncrust-files.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/uncrust-files.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/uncrustify.xml.in b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/uncrustify.xml.in
index 33f6c6a5..33f6c6a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/uncrustify.xml.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/uncrustify.xml.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/xsupplicant.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/xsupplicant.cfg
index 66a93d78..4cb583bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/etc/xsupplicant.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/etc/xsupplicant.cfg
@@ -60,7 +60,7 @@ sp_func_proto_paren		= remove	# "int foo ();" vs "int foo();"
 # align_with_tabs			= FALSE		# use tabs to align
 # align_on_tabstop		= FALSE		# align on tabstops
 # align_enum_equ_span		= 4
-# align_nl_cont			= TRUE
+# align_nl_cont			= 1
 # align_var_def_span		= 2
 # align_var_def_inline		= TRUE
 # align_var_def_star		= TRUE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/extras.vpj b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/extras.vpj
index 4b57772a..4b57772a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/extras.vpj
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/extras.vpj
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/forUncrustifySources.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/forUncrustifySources.cfg
index 1f115593..2e9fa1fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/forUncrustifySources.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/forUncrustifySources.cfg
@@ -14,7 +14,7 @@ align_enum_equ_span                       = 4
 align_enum_equ_thresh                     = 8
 align_func_params                         = true
 align_func_proto_star_style               = 1
-align_nl_cont                             = true
+align_nl_cont                             = 1
 align_number_right                        = true
 align_pp_define_gap                       = 4
 align_pp_define_span                      = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/forUncrustifySources.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/forUncrustifySources.txt
index 6385ab7d..6385ab7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/forUncrustifySources.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/forUncrustifySources.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/ChunkStack.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/lnt/ChunkStack.lnt
index cea5860f..cea5860f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/ChunkStack.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/lnt/ChunkStack.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/align.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/lnt/align.lnt
index 32e388c3..32e388c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/align.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/lnt/align.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/chunk_list.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/lnt/chunk_list.lnt
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/chunk_list.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/lnt/chunk_list.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/logger.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/lnt/logger.lnt
index e41a1282..e41a1282 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/logger.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/lnt/logger.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/readme.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/lnt/readme.txt
index f2534349..f2534349 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/readme.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/lnt/readme.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/unc_text.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/lnt/unc_text.lnt
index 89cb4fdb..89cb4fdb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/unc_text.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/lnt/unc_text.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/uncrustify_types.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/lnt/uncrustify_types.lnt
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/lnt/uncrustify_types.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/lnt/uncrustify_types.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/man/uncrustify.1.in b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/man/uncrustify.1.in
index 41267296..41267296 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/man/uncrustify.1.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/man/uncrustify.1.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/osx/Xcode Organizer Actions.xccommands b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/osx/Xcode Organizer Actions.xccommands
index be727021..be727021 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/osx/Xcode Organizer Actions.xccommands
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/osx/Xcode Organizer Actions.xccommands
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/package.json b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/package.json
index f8fcb2a0..fc10438c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/package.json
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uncrustify",
-  "version": "0.76.0",
+  "version": "0.78.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.76.0/release-process.rst b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/release-process.rst
index c208330a..30217840 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/release-process.rst
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.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 2022-11-22, for Uncrustify 0.76.0.*
+*This document was last updated on 2023-11-13, for Uncrustify 0.78.0.*
 
 This document uses "0.1.2" throughout as an example version number.
 Whenever you see this, you should substitute the version number
@@ -62,6 +62,27 @@ To start the release process, first check that:
 - Your build is up to date
 - check the list of authors with scripts/prepare_list_of_authors.sh
 
+You might need a new PAT for your account, for your admin-account.
+See:
+https://github.blog/2020-12-15-token-authentication-requirements-for-git-operations/
+https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token
+   loggin with a admin account at https://github.com/uncrustify/uncrustify
+   on the right, click on the photo
+   scroll down to "Settings"
+   on the left, scroll down to "Developer settings", and click
+   on the left, click on "Personal access tokens"
+   choose "Tokens (classic), click
+   if necessary "Delete" expired token(s)
+   click on "Generate new token"
+   choose "Generate new token (classic)", click
+   choose a "what's this token for"
+   click on "repo"
+   scroll down to bottom and click on "Generate token"
+Make sure to copy your personal access token now. You won’t be able to see it again!
+   copy the token "ghp_otx****"
+   and substitute in the file .git/config for [remote "origin"]
+   "url = https://gmaurel:ghp_otxZ****"
+
 Then, run::
 
    $ scripts/release_tool.py init
@@ -176,9 +197,11 @@ Submit and Tag the Release
 
 Push the release candidate branch to GitHub, and create a pull request.
 Once the pull request is merged, tag the release using:
-Make sure, the file .git/config has the right value:
+Make sure, the file .git/config has the right 'admin' value:
 [remote "origin"]
-        url = https://github.com/uncrustify/uncrustify.git
+        url = https://<admin account>:<PAT>@github.com/uncrustify/uncrustify.git
+Check it with:
+$ git config --local --get remote.origin.url
 
 .. code::
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/Gcov_test.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/Gcov_test.sh
index a3853773..a3853773 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/Gcov_test.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/Gcov_test.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/Run_clang-tidy.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/Run_clang-tidy.sh
index c2f1c150..c2f1c150 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/Run_clang-tidy.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/Run_clang-tidy.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/add_test_list.awk b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/add_test_list.awk
index 1fbe2840..1fbe2840 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/add_test_list.awk
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/add_test_list.awk
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/check_options.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/check_options.py
index 1d32224b..1d32224b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/check_options.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/check_options.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/cmpcfg.pl b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/cmpcfg.pl
index df119dc1..df119dc1 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/cmpcfg.pl
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/cmpcfg.pl
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/compare_the_gcov.awk b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/compare_the_gcov.awk
index 30dba1ad..30dba1ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/compare_the_gcov.awk
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/compare_the_gcov.awk
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/gen_changelog.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/gen_changelog.py
index 8e042385..52428c58 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/gen_changelog.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/gen_changelog.py
@@ -96,11 +96,11 @@ def main():
             changes.append(c)
 
     for c in changes:
-        print(c.sha)
+        print('  ', c.sha)
         for o in c.added_options:
-            print('  Added   : {:36} {}'.format(o, c.date))
+            print('     Added   : {:36} {}'.format(o, c.date))
         for o in c.removed_options:
-            print('  Removed : {:36} {}'.format(o, c.date))
+            print('     Removed : {:36} {}'.format(o, c.date))
 
     return 0
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/gen_config_combinations_uniq_output.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/gen_config_combinations_uniq_output.py
index 2fa4fb0c..2fa4fb0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/gen_config_combinations_uniq_output.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/gen_config_combinations_uniq_output.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/gen_config_combinations_uniq_output_example.json b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/gen_config_combinations_uniq_output_example.json
index 315fdfef..315fdfef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/gen_config_combinations_uniq_output_example.json
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/gen_config_combinations_uniq_output_example.json
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/grammar_permutator.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/grammar_permutator.py
index cd42bd9f..cd42bd9f 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/grammar_permutator.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/grammar_permutator.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/make_katehl.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/make_katehl.py
index e241986a..e241986a 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/make_katehl.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/make_katehl.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/make_option_enum.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/make_option_enum.py
index c141bb04..c141bb04 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/make_option_enum.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/make_option_enum.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/make_options.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/make_options.py
index 71e97115..71e97115 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/make_options.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/make_options.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/make_punctuator_table.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/make_punctuator_table.py
index f3d90081..f3d90081 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/make_punctuator_table.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/make_punctuator_table.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/make_version.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/make_version.py
index 14e20018..14e20018 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/make_version.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/make_version.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/option_reducer.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/option_reducer.py
index 403ff92b..403ff92b 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/option_reducer.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/option_reducer.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/au-sm123.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/pclint/au-sm123.lnt
index 6eaf9a6b..6eaf9a6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/au-sm123.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/pclint/au-sm123.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/co-gcc.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/pclint/co-gcc.h
index e948a20f..e948a20f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/co-gcc.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/pclint/co-gcc.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/co-gcc.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/pclint/co-gcc.lnt
index f7bd38dd..f7bd38dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/co-gcc.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/pclint/co-gcc.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/lint_cfg.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/pclint/lint_cfg.lnt
index 72530d53..72530d53 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/lint_cfg.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/pclint/lint_cfg.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/pclint_cfg_eclipse.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/pclint/pclint_cfg_eclipse.lnt
index d1945c5b..d1945c5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/pclint_cfg_eclipse.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/pclint/pclint_cfg_eclipse.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/policy.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/pclint/policy.lnt
index 911e74b7..911e74b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/policy.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/pclint/policy.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/run-pclint-eclipse.bat b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/pclint/run-pclint-eclipse.bat
index 051813d6..051813d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/run-pclint-eclipse.bat
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/pclint/run-pclint-eclipse.bat
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/usage.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/pclint/usage.txt
index fff1c305..fff1c305 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/pclint/usage.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/pclint/usage.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/prepare_list_of_authors.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/prepare_list_of_authors.sh
index 4151ef8a..4151ef8a 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/prepare_list_of_authors.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/prepare_list_of_authors.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/release_tool.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/release_tool.py
index b90f543b..32a6f89e 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/release_tool.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/release_tool.py
@@ -1,11 +1,14 @@
 #!/usr/bin/env python
 
 import argparse
-import git
+import git  # /usr/lib/python3/dist-packages/git/__init__.py
 import os
-import re
+import re  # Support for regular expressions (RE).
 import sys
 
+# use the variable DEBUG to get more output
+DEBUG = 1
+
 if sys.version_info[0] < 3:
     input = raw_input
 
@@ -24,11 +27,16 @@ def fatal(msg):
 # -----------------------------------------------------------------------------
 def get_version_str(repo, candidate=True, required=True):
     if candidate:
+        if DEBUG:
+            print('git.symbolic-ref("-q", "--short", "HEAD")')
         b = repo.git.symbolic_ref('-q', '--short', 'HEAD')
         m = re_branch.match(b)
         if m:
             return m.group(1)
 
+    if DEBUG:
+        print('git.describe("HEAD")')
+
     d = repo.git.describe('HEAD')
     m = re_desc.match(d)
     if m:
@@ -74,13 +82,26 @@ def generate(repo, version, path, *args):
     import subprocess
 
     p = os.path.join(repo.working_tree_dir, path)
+
+    if version is None:
+        with open(p, 'r') as f:
+            content = f.read()
+            version = re.search(r'Uncrustify([a-z_]*)?-([0-9]+(\.[0-9]+)+(-[0-9]+)?)?(-?[0-9a-f]{6,})?', content)
+            if version:
+                version = version.group()
+            else:
+                version = 'Uncrustify'
+            version += "-dev"
+    else:
+        version = 'Uncrustify-{}'.format(version)
+
     with open(p, 'w') as f:
         c = subprocess.check_call(args, stdout=f)
     print('Created: {}'.format(path))
 
     alter(repo, path,
-          r'Uncrustify-[0-9.]+(-[0-9]+-[0-9a-f]+(-dirty)?)?',
-          r'Uncrustify-{}'.format(version))
+           r'Uncrustify([a-z_]*)?-([0-9]+(\.[0-9]+)+(-[0-9]+)?)?(-?[0-9a-f]{6,})?(-?dirty)?(-dev)?',
+           r'{}'.format(version))
 
 
 # -----------------------------------------------------------------------------
@@ -97,29 +118,47 @@ def cmd_init(repo, args):
         else:
             v = input('Version to be created? ')
 
+    if DEBUG:
+        print('The value for version is', v)
+
     if not re_version.match(v):
         fatal('Bad version number, \'{}\''.format(v))
+    if DEBUG:
+        s = 'git.checkout(-b, "uncrustify-RC-{}")'.format(v)
+        print(s)
 
     repo.git.checkout('-b', 'uncrustify-RC-{}'.format(v))
 
 
 # -----------------------------------------------------------------------------
 def cmd_update(repo, args):
-    v = get_version_str(repo)
+    if args.keepversion:
+        print('Not updating version info in docs')
+        v = None
+    else:
+        v = get_version_str(repo)
     c = get_option_count(args.executable)
 
-    alter(repo, 'CMakeLists.txt',
-          r'(set *[(] *UNCRUSTIFY_VERSION +")[0-9.]+',
-          r'\g<1>{}'.format(v))
-    alter(repo, 'package.json',
-          r'("version" *): *"[0-9.]+"',
-          r'\g<1>: "{}"'.format(v))
-    alter(repo, 'README.md',
-          r'[0-9]+ configurable options as of version [0-9.]+',
-          r'{} configurable options as of version {}'.format(c, v))
-    alter(repo, 'documentation/htdocs/index.html',
-          r'[0-9]+ configurable options as of version [0-9.]+',
-          r'{} configurable options as of version {}'.format(c, v))
+    if not args.keepversion:
+        alter(repo, 'CMakeLists.txt',
+              r'(set *[(] *UNCRUSTIFY_VERSION +")[0-9.]+',
+              r'\g<1>{}'.format(v))
+        alter(repo, 'package.json',
+              r'("version" *): *"[0-9.]+"',
+              r'\g<1>: "{}"'.format(v))
+        alter(repo, 'README.md',
+              r'[0-9]+ configurable options as of version [0-9.]+',
+              r'{} configurable options as of version {}'.format(c, v))
+        alter(repo, 'documentation/htdocs/index.html',
+              r'[0-9]+ configurable options as of version [0-9.]+',
+              r'{} configurable options as of version {}'.format(c, v))
+    else:
+        alter(repo, 'README.md',
+              r'[0-9]+ configurable options as of version ',
+              r'{} configurable options as of version '.format(c))
+        alter(repo, 'documentation/htdocs/index.html',
+              r'[0-9]+ configurable options as of version ',
+              r'{} configurable options as of version '.format(c))
 
     generate(repo, v, 'etc/defaults.cfg',
              args.executable, '--show-config')
@@ -130,6 +169,15 @@ def cmd_update(repo, args):
     generate(repo, v, 'etc/uigui_uncrustify.ini',
              args.executable, '--universalindent')
 
+    # For 'optiondocs' command, update universalindent.cfg also, since
+    # unit tests verify it.
+    if args.keepversion:
+        # Needs to be kept in sync with test_cli_options.py
+        generate(repo, v, 'tests/cli/output/universalindent.cfg',
+                 args.executable, '--universalindent')
+        alter(repo, 'tests/cli/output/universalindent.cfg',
+              r'(version=U.+)|(\(\d+\))|(\r)',
+              r'');
 
 # -----------------------------------------------------------------------------
 def cmd_commit(repo, args):
@@ -147,6 +195,18 @@ def cmd_commit(repo, args):
 def cmd_tag(repo, args):
     import uuid
 
+    # user_name = repo.config_reader().get_value('user', 'name')
+    url = repo.config_reader().get_value('remote "origin"', 'url')
+    print('The user account is', url)
+    print('you need an "admin" account')
+    v = input('Do you really want to use this account? (yes/no) ')
+    if len(v) == 0:
+        fatal("0 End")
+    else:
+        print(v)
+        if v != "yes":
+            fatal("2 End")
+
     # Determine location of remote repository
     if args.ssh:
         s = 'git@{}:'.format(args.server)
@@ -206,6 +266,12 @@ def main():
                              help='version number for release')
 
     parser_update = subparsers.add_parser(
+        'optiondocs', help='update documentation from options')
+    parser_update.set_defaults(func=cmd_update, keepversion=True)
+    parser_update.add_argument('executable',
+                               help='path to uncrustify executable')
+
+    parser_update = subparsers.add_parser(
         'update', help='update version information')
     parser_update.set_defaults(func=cmd_update, keepversion=False)
     parser_update.add_argument('executable',
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/run_ctest.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/run_ctest.py
index 0267e0ad..65a04774 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/run_ctest.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/run_ctest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import argparse
 import math
@@ -27,6 +27,7 @@ def main():
         sys.exit(-1)
 
     cmd = ['ctest', '-j{}'.format(args.parallel)]
+    #cmd = ['ctest', '--verbose', '-j{}'.format(args.parallel)]                    Issue #4066
     if not args.quiet:
         cmd.append('--output-on-failure')
     cmd += args.args
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/tokenizer.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/tokenizer.py
index 0bc33bac..0bc33bac 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/tokenizer.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/tokenizer.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/update_emscripten_bindings.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/update_emscripten_bindings.py
index 781311e2..781311e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/scripts/update_emscripten_bindings.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/scripts/update_emscripten_bindings.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/.kateconfig b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/.kateconfig
index 4d9024f0..4d9024f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/.kateconfig
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/.kateconfig
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ChunkStack.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/ChunkStack.cpp
index dfa0f888..fbf8a737 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ChunkStack.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/ChunkStack.cpp
@@ -49,13 +49,13 @@ Chunk *ChunkStack::GetChunk(size_t idx) const
    {
       return(m_cse[idx].m_pc);
    }
-   return(nullptr);
+   return(Chunk::NullChunkPtr);
 }
 
 
 Chunk *ChunkStack::Pop_Front()
 {
-   Chunk *pc = nullptr;
+   Chunk *pc = Chunk::NullChunkPtr;
 
    if (!m_cse.empty())
    {
@@ -68,7 +68,7 @@ Chunk *ChunkStack::Pop_Front()
 
 Chunk *ChunkStack::Pop_Back()
 {
-   Chunk *pc = nullptr;
+   Chunk *pc = Chunk::NullChunkPtr;
 
    if (!m_cse.empty())
    {
@@ -94,7 +94,7 @@ void ChunkStack::Zap(size_t idx)
 {
    if (idx < m_cse.size())
    {
-      m_cse[idx].m_pc = nullptr;
+      m_cse[idx].m_pc = Chunk::NullChunkPtr;
    }
 }
 
@@ -105,7 +105,7 @@ void ChunkStack::Collapse()
 
    for (size_t rd_idx = 0; rd_idx < m_cse.size(); rd_idx++)
    {
-      if (m_cse[rd_idx].m_pc != nullptr)
+      if (m_cse[rd_idx].m_pc->IsNotNullChunk())
       {
          if (rd_idx != wr_idx)
          {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ChunkStack.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/ChunkStack.h
index b33e1dd5..6ab1c867 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ChunkStack.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/ChunkStack.h
@@ -8,6 +8,7 @@
 #ifndef CHUNKSTACK_H_INCLUDED
 #define CHUNKSTACK_H_INCLUDED
 
+#include "chunk.h"
 #include "uncrustify_types.h"
 
 class ChunkStack
@@ -17,7 +18,7 @@ public:
    {
       Entry()
          : m_seqnum(0)
-         , m_pc(0)
+         , m_pc(Chunk::NullChunkPtr)
       {
       }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/EnumStructUnionParser.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/EnumStructUnionParser.cpp
index d1c7bc67..93c76995 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/EnumStructUnionParser.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/EnumStructUnionParser.cpp
@@ -37,8 +37,8 @@ static bool adj_tokens_match_qualified_identifier_pattern(Chunk *prev, Chunk *ne
 {
    LOG_FUNC_ENTRY();
 
-   if (  prev != nullptr
-      && next != nullptr)
+   if (  prev->IsNotNullChunk()
+      && next->IsNotNullChunk())
    {
       auto prev_token_type = prev->GetType();
       auto next_token_type = next->GetType();
@@ -98,8 +98,8 @@ static bool adj_tokens_match_var_def_pattern(Chunk *prev, Chunk *next)
 {
    LOG_FUNC_ENTRY();
 
-   if (  prev != nullptr
-      && next != nullptr)
+   if (  prev->IsNotNullChunk()
+      && next->IsNotNullChunk())
    {
       auto prev_token_type = prev->GetType();
       auto next_token_type = next->GetType();
@@ -330,15 +330,14 @@ static bool chunk_is_after(Chunk *pc, Chunk *after, bool test_equal = true)
 {
    LOG_FUNC_ENTRY();
 
-   if (  pc != nullptr
-      && pc->IsNotNullChunk())
+   if (pc->IsNotNullChunk())
    {
       if (  test_equal
          && pc == after)
       {
          return(true);
       }
-      else if (after != nullptr)
+      else if (after->IsNotNullChunk())
       {
          auto pc_column    = pc->GetOrigCol();
          auto pc_line      = pc->GetOrigLine();
@@ -365,15 +364,14 @@ static bool chunk_is_before(Chunk *pc, Chunk *before, bool test_equal = true)
 {
    LOG_FUNC_ENTRY();
 
-   if (  pc != nullptr
-      && pc->IsNotNullChunk())
+   if (pc->IsNotNullChunk())
    {
       if (  test_equal
          && pc == before)
       {
          return(true);
       }
-      else if (before != nullptr)
+      else if (before->IsNotNullChunk())
       {
          auto pc_column     = pc->GetOrigCol();
          auto pc_line       = pc->GetOrigLine();
@@ -467,8 +465,8 @@ static std::pair<Chunk *, Chunk *> match_qualified_identifier(Chunk *pc)
    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)
+   if (  end->IsNotNullChunk()
+      && start->IsNotNullChunk())
    {
       auto *double_colon = start->GetNextType(CT_DC_MEMBER);
 
@@ -478,7 +476,7 @@ static std::pair<Chunk *, Chunk *> match_qualified_identifier(Chunk *pc)
          return(std::make_pair(start, end));
       }
    }
-   return(std::make_pair(nullptr, nullptr));
+   return(std::make_pair(Chunk::NullChunkPtr, Chunk::NullChunkPtr));
 } // match_qualified_identifier
 
 
@@ -500,7 +498,7 @@ static std::tuple<Chunk *, Chunk *, Chunk *> match_variable(Chunk *pc, std::size
    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 *identifier           = identifier_end_pair.first->IsNotNullChunk() ? identifier_end_pair.first : start_identifier_pair.second;
    auto *start                = start_identifier_pair.first;
 
    /**
@@ -511,12 +509,12 @@ static std::tuple<Chunk *, Chunk *, Chunk *> match_variable(Chunk *pc, std::size
 
    if (  identifier->IsNotNullChunk()
       && start->IsNotNullChunk()
-      && (  end != nullptr
+      && (  end->IsNotNullChunk()
          || identifier->GetPrevNcNnlNi()->Is(CT_WORD)))
    {
       return(std::make_tuple(start, identifier, end));
    }
-   return(std::make_tuple(nullptr, nullptr, nullptr));
+   return(std::make_tuple(Chunk::NullChunkPtr, Chunk::NullChunkPtr, Chunk::NullChunkPtr));
 } // match_variable
 
 
@@ -539,15 +537,14 @@ static std::pair<Chunk *, Chunk *> match_variable_end(Chunk *pc, std::size_t lev
 {
    LOG_FUNC_ENTRY();
 
-   Chunk *identifier = nullptr;
+   Chunk *identifier = Chunk::NullChunkPtr;
 
-   while (  pc != nullptr
-         && pc->IsNotNullChunk())
+   while (pc->IsNotNullChunk())
    {
       /**
        * skip any right-hand side assignments
        */
-      Chunk *rhs_exp_end = nullptr;
+      Chunk *rhs_exp_end = Chunk::NullChunkPtr;
 
       if (pc->Is(CT_ASSIGN))
       {
@@ -562,8 +559,7 @@ static std::pair<Chunk *, Chunk *> match_variable_end(Chunk *pc, std::size_t lev
       /**
        * skip current and preceding chunks if at a higher brace level
        */
-      while (  pc != nullptr
-            && pc->IsNotNullChunk()
+      while (  pc->IsNotNullChunk()
             && pc->GetLevel() > level)
       {
          pc = pc->GetNextNcNnl();
@@ -620,7 +616,7 @@ static std::pair<Chunk *, Chunk *> match_variable_end(Chunk *pc, std::size_t lev
       }
       pc = next;
    }
-   return(std::make_pair(nullptr, nullptr));
+   return(std::make_pair(Chunk::NullChunkPtr, Chunk::NullChunkPtr));
 } // match_variable_end
 
 
@@ -646,11 +642,6 @@ static std::pair<Chunk *, Chunk *> match_variable_start(Chunk *pc, std::size_t l
 
    Chunk *identifier = Chunk::NullChunkPtr;
 
-   if (pc == nullptr)
-   {
-      pc = Chunk::NullChunkPtr;
-   }
-
    while (pc->IsNotNullChunk())
    {
       /**
@@ -756,8 +747,7 @@ static Chunk *skip_scope_resolution_and_nested_name_specifiers(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   if (  (  pc != nullptr
-         && pc->TestFlags(PCF_IN_TEMPLATE))
+   if (  pc->TestFlags(PCF_IN_TEMPLATE)
       || pc->Is(CT_DC_MEMBER)
       || pc->Is(CT_TYPE)
       || pc->Is(CT_WORD))
@@ -797,13 +787,7 @@ static Chunk *skip_scope_resolution_and_nested_name_specifiers_rev(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   if (pc == nullptr)
-   {
-      pc = Chunk::NullChunkPtr;
-   }
-
-   if (  (  pc->IsNotNullChunk()
-         && pc->TestFlags(PCF_IN_TEMPLATE))
+   if (  pc->TestFlags(PCF_IN_TEMPLATE)
       || pc->Is(CT_DC_MEMBER)
       || pc->Is(CT_TYPE)
       || pc->Is(CT_WORD))
@@ -835,10 +819,10 @@ static Chunk *skip_scope_resolution_and_nested_name_specifiers_rev(Chunk *pc)
 
 
 EnumStructUnionParser::EnumStructUnionParser()
-   : m_end(nullptr)
+   : m_end(Chunk::NullChunkPtr)
    , m_parse_error(false)
-   , m_start(nullptr)
-   , m_type(nullptr)
+   , m_start(Chunk::NullChunkPtr)
+   , m_type(Chunk::NullChunkPtr)
 {
 } // EnumStructUnionParser::EnumStructUnionParser
 
@@ -875,12 +859,12 @@ void EnumStructUnionParser::analyze_identifiers()
     * "class/struct [macros/attributes ...] [: bases] { } x, ..."
     */
 
-   Chunk      *template_end      = get_template_end();
-   auto       *body_end          = get_body_end();
-   auto       *body_start        = get_body_start();
-   T_PcfFlags flags              = PCF_VAR_1ST_DEF;
-   auto       *inheritance_start = get_inheritance_start();
-   Chunk      *pc                = body_end ? body_end : m_start;
+   Chunk    *template_end      = get_template_end();
+   auto     *body_end          = get_body_end();
+   auto     *body_start        = get_body_start();
+   PcfFlags flags              = PCF_VAR_1ST_DEF;
+   auto     *inheritance_start = get_inheritance_start();
+   Chunk    *pc                = body_end->IsNotNullChunk() ? body_end : m_start;
 
    /**
     * first, try a simple approach to identify any associated type
@@ -894,21 +878,16 @@ void EnumStructUnionParser::analyze_identifiers()
        * variable identifiers after the closing brace or close angle bracket
        */
 
-      if (body_end != nullptr)
+      if (body_end->IsNotNullChunk())
       {
          pc = body_end;
       }
-      else if (template_end != nullptr)
+      else if (template_end->IsNotNullChunk())
       {
          pc = template_end;
       }
    }
 
-   if (pc == nullptr)
-   {
-      pc = Chunk::NullChunkPtr;
-   }
-
    if (pc->GetNextNcNnl() == m_end)
    {
       /**
@@ -931,7 +910,7 @@ void EnumStructUnionParser::analyze_identifiers()
       pc = pc->GetNextNcNnl();
    }
 
-   if (body_end != nullptr)
+   if (body_end->IsNotNullChunk())
    {
       /**
        * a closing brace was found, so any identifiers trailing the closing
@@ -967,10 +946,10 @@ void EnumStructUnionParser::analyze_identifiers()
       auto *identifier = std::get<1>(match);
       auto *end        = std::get<2>(match);
 
-      if (  start != nullptr
-         && identifier != nullptr)
+      if (  start->IsNotNullChunk()
+         && identifier->IsNotNullChunk())
       {
-         if (end != nullptr)
+         if (end->IsNotNullChunk())
          {
             mark_variable(identifier, flags);
 
@@ -981,7 +960,7 @@ void EnumStructUnionParser::analyze_identifiers()
          }
       }
 
-      if (end != nullptr)
+      if (end->IsNotNullChunk())
       {
          pc = end;
       }
@@ -1058,8 +1037,8 @@ bool EnumStructUnionParser::body_detected() const
    auto *body_end   = get_body_end();
    auto *body_start = get_body_start();
 
-   return(  body_end != nullptr
-         && body_start != nullptr);
+   return(  body_end->IsNotNullChunk()
+         && body_start->IsNotNullChunk());
 } // EnumStructUnionParser::body_detected
 
 
@@ -1089,7 +1068,7 @@ Chunk *EnumStructUnionParser::get_body_end() const
    {
       return(it_token_chunk_map_pair->second.at(0));
    }
-   return(nullptr);
+   return(Chunk::NullChunkPtr);
 } // EnumStructUnionParser::get_body_end
 
 
@@ -1103,7 +1082,7 @@ Chunk *EnumStructUnionParser::get_body_start() const
    {
       return(it_token_chunk_map_pair->second.at(0));
    }
-   return(nullptr);
+   return(Chunk::NullChunkPtr);
 } // EnumStructUnionParser::get_body_start
 
 
@@ -1117,7 +1096,7 @@ Chunk *EnumStructUnionParser::get_enum_base_start() const
    {
       return(it_token_chunk_map_pair->second.at(0));
    }
-   return(nullptr);
+   return(Chunk::NullChunkPtr);
 } // EnumStructUnionParser::get_enum_base_start
 
 
@@ -1131,7 +1110,7 @@ Chunk *EnumStructUnionParser::get_first_top_level_comma() const
    {
       return(it_token_chunk_map_pair->second.at(0));
    }
-   return(nullptr);
+   return(Chunk::NullChunkPtr);
 } // EnumStructUnionParser::get_first_top_level_comma
 
 
@@ -1139,14 +1118,14 @@ Chunk *EnumStructUnionParser::get_inheritance_end() const
 {
    LOG_FUNC_ENTRY();
 
-   Chunk *brace_open        = nullptr;
+   Chunk *brace_open        = Chunk::NullChunkPtr;
    auto  *inheritance_start = get_inheritance_start();
 
-   if (inheritance_start != nullptr)
+   if (inheritance_start->IsNotNullChunk())
    {
       brace_open = get_body_start();
 
-      if (brace_open == nullptr)
+      if (brace_open->IsNullChunk())
       {
          brace_open = inheritance_start->GetNextType(CT_BRACE_OPEN, m_start->GetLevel(), E_Scope::ALL);
       }
@@ -1165,7 +1144,7 @@ Chunk *EnumStructUnionParser::get_inheritance_start() const
    {
       return(it_token_chunk_map_pair->second.at(0));
    }
-   return(nullptr);
+   return(Chunk::NullChunkPtr);
 } // EnumStructUnionParser::get_inheritance_start
 
 
@@ -1193,7 +1172,7 @@ Chunk *EnumStructUnionParser::get_template_end() const
    {
       return(it_token_chunk_map_pair->second.at(0));
    }
-   return(nullptr);
+   return(Chunk::NullChunkPtr);
 } // EnumStructUnionParser::get_template_end
 
 
@@ -1207,7 +1186,7 @@ Chunk *EnumStructUnionParser::get_template_start() const
    {
       return(it_token_chunk_map_pair->second.at(0));
    }
-   return(nullptr);
+   return(Chunk::NullChunkPtr);
 } // EnumStructUnionParser::get_template_start
 
 
@@ -1229,14 +1208,14 @@ Chunk *EnumStructUnionParser::get_where_end() const
 {
    LOG_FUNC_ENTRY();
 
-   Chunk *brace_open  = nullptr;
+   Chunk *brace_open  = Chunk::NullChunkPtr;
    auto  *where_start = get_where_start();
 
-   if (where_start != nullptr)
+   if (where_start->IsNotNullChunk())
    {
       brace_open = get_body_start();
 
-      if (brace_open == nullptr)
+      if (brace_open->IsNullChunk())
       {
          brace_open = where_start->GetNextType(CT_BRACE_OPEN, m_start->GetLevel(), E_Scope::ALL);
       }
@@ -1255,7 +1234,7 @@ Chunk *EnumStructUnionParser::get_where_start() const
    {
       return(it_token_chunk_map_pair->second.at(0));
    }
-   return(nullptr);
+   return(Chunk::NullChunkPtr);
 } // EnumStructUnionParser::get_where_start
 
 
@@ -1275,7 +1254,7 @@ void EnumStructUnionParser::initialize(Chunk *pc)
    m_chunk_map.clear();
 
    m_start = pc;
-   m_type  = nullptr;
+   m_type  = Chunk::NullChunkPtr;
    pc      = try_find_end_chunk(pc);
 
    if (parse_error_detected())
@@ -1411,16 +1390,15 @@ bool EnumStructUnionParser::is_within_inheritance_list(Chunk *pc) const
 {
    LOG_FUNC_ENTRY();
 
-   if (  pc != nullptr
-      && pc->TestFlags(PCF_IN_CLASS_BASE))
+   if (pc->TestFlags(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)
+   if (  inheritance_end->IsNotNullChunk()
+      && inheritance_start->IsNotNullChunk())
    {
       return(chunk_is_between(pc, inheritance_start, inheritance_end));
    }
@@ -1432,16 +1410,15 @@ bool EnumStructUnionParser::is_within_where_clause(Chunk *pc) const
 {
    LOG_FUNC_ENTRY();
 
-   if (  pc != nullptr
-      && pc->TestFlags(PCF_IN_WHERE_SPEC))
+   if (pc->TestFlags(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)
+   if (  where_end->IsNotNullChunk()
+      && where_start->IsNotNullChunk())
    {
       return(chunk_is_between(pc, where_start, where_end));
    }
@@ -1453,10 +1430,9 @@ void EnumStructUnionParser::mark_base_classes(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   T_PcfFlags flags = PCF_VAR_1ST_DEF;
+   PcfFlags flags = PCF_VAR_1ST_DEF;
 
-   while (  pc != nullptr
-         && pc->IsNotNullChunk())
+   while (pc->IsNotNullChunk())
    {
       pc->SetFlagBits(PCF_IN_CLASS_BASE);
       /**
@@ -1524,7 +1500,7 @@ void EnumStructUnionParser::mark_braces(Chunk *brace_open)
 {
    LOG_FUNC_ENTRY();
 
-   T_PcfFlags flags = PCF_NONE;
+   PcfFlags flags = PCF_NONE;
 
    if (m_start->Is(CT_CLASS))
    {
@@ -1555,7 +1531,7 @@ void EnumStructUnionParser::mark_braces(Chunk *brace_open)
 
       auto *inheritance_start = get_inheritance_start();
 
-      if (inheritance_start != nullptr)
+      if (inheritance_start->IsNotNullChunk())
       {
          /**
           * the class/struct/union is a derived class; mark the base
@@ -1677,7 +1653,12 @@ void EnumStructUnionParser::mark_enum_integral_type(Chunk *colon)
 {
    LOG_FUNC_ENTRY();
 
-   colon->SetType(CT_BIT_COLON);
+   // Issue #4040
+   LOG_FMT(LFTOR,
+           "%s(%d): orig line is %zu, orig col is %zu\n",
+           __unqualified_func__, __LINE__,
+           colon->GetOrigLine(), colon->GetOrigCol());
+   colon->SetType(CT_ENUM_COLON);
    colon->SetParentType(m_start->GetType());
 
    auto *body_start = get_body_start();
@@ -1845,7 +1826,7 @@ void EnumStructUnionParser::mark_template(Chunk *start) const
 {
    LOG_FUNC_ENTRY();
 
-   if (start != nullptr)
+   if (start->IsNotNullChunk())
    {
       LOG_FMT(LTEMPL,
               "%s(%d): Template detected: '%s' at orig line %zu, orig col %zu\n",
@@ -1872,8 +1853,8 @@ void EnumStructUnionParser::mark_template_args(Chunk *start, Chunk *end) const
 {
    LOG_FUNC_ENTRY();
 
-   if (  end != nullptr
-      && start != nullptr)
+   if (  end->IsNotNullChunk()
+      && start->IsNotNullChunk())
    {
       LOG_FMT(LTEMPL,
               "%s(%d): Start of template detected: '%s' at orig line %zu, orig col %zu\n",
@@ -1883,8 +1864,8 @@ void EnumStructUnionParser::mark_template_args(Chunk *start, Chunk *end) const
               start->GetOrigLine(),
               start->GetOrigCol());
 
-      T_PcfFlags flags = PCF_IN_TEMPLATE;
-      Chunk      *next = start;
+      PcfFlags flags = PCF_IN_TEMPLATE;
+      Chunk    *next = start;
 
       /**
        * TODO: for now, just mark the chunks within the template as PCF_IN_TEMPLATE;
@@ -1917,7 +1898,7 @@ void EnumStructUnionParser::mark_type(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   if (pc != nullptr)
+   if (pc->IsNotNullChunk())
    {
       m_type = pc;
 
@@ -1931,11 +1912,11 @@ void EnumStructUnionParser::mark_type(Chunk *pc)
 } // EnumStructUnionParser::mark_type
 
 
-void EnumStructUnionParser::mark_variable(Chunk *variable, T_PcfFlags flags)
+void EnumStructUnionParser::mark_variable(Chunk *variable, PcfFlags flags)
 {
    LOG_FUNC_ENTRY();
 
-   if (variable != nullptr)
+   if (variable->IsNotNullChunk())
    {
       LOG_FMT(LVARDEF,
               "%s(%d): Variable definition detected: '%s' at orig line is %zu, orig col is %zu, set %s\n",
@@ -1957,7 +1938,7 @@ void EnumStructUnionParser::mark_where_clause(Chunk *where)
 {
    LOG_FUNC_ENTRY();
 
-   if (where != nullptr)
+   if (where->IsNotNullChunk())
    {
       LOG_FMT(LFTOR,
               "%s(%d): Where clause detected: orig line is %zu, orig col is %zu\n",
@@ -1973,7 +1954,7 @@ void EnumStructUnionParser::mark_where_clause(Chunk *where)
 
    set_where_end(where_end);
 
-   T_PcfFlags flags;
+   PcfFlags flags;
 
    for (auto *pc = where_start; pc != where_end; pc = pc->GetNextNcNnl())
    {
@@ -1986,7 +1967,7 @@ void EnumStructUnionParser::mark_where_colon(Chunk *colon)
 {
    LOG_FUNC_ENTRY();
 
-   if (colon != nullptr)
+   if (colon->IsNotNullChunk())
    {
       LOG_FMT(LFTOR,
               "%s(%d): Where colon detected: orig line is %zu, orig col is %zu\n",
@@ -2433,7 +2414,7 @@ void EnumStructUnionParser::record_question_operator(Chunk *question)
 
 void EnumStructUnionParser::record_top_level_comma(Chunk *comma)
 {
-   if (  comma != nullptr
+   if (  comma->IsNotNullChunk()
       && comma->GetLevel() == m_start->GetLevel()
       && !is_within_conditional(comma)
       && !is_within_inheritance_list(comma))
@@ -2487,9 +2468,9 @@ Chunk *EnumStructUnionParser::refine_end_chunk(Chunk *pc)
             auto *identifier = std::get<1>(match);
             auto *end        = std::get<2>(match);
 
-            if (  end == nullptr
-               || identifier == nullptr
-               || start == nullptr)
+            if (  end->IsNullChunk()
+               || identifier->IsNullChunk()
+               || start->IsNullChunk())
             {
                break;
             }
@@ -2608,8 +2589,8 @@ bool EnumStructUnionParser::template_detected() const
    auto *template_end   = get_template_end();
    auto *template_start = get_template_start();
 
-   return(  template_end != nullptr
-         && template_start != nullptr);
+   return(  template_end->IsNotNullChunk()
+         && template_start->IsNotNullChunk());
 } // EnumStructUnionParser::template_detected
 
 
@@ -2732,7 +2713,7 @@ void EnumStructUnionParser::try_post_identify_type()
    Chunk *body_end = get_body_end();
 
    if (  !type_identified()
-      && body_end == nullptr)
+      && body_end->IsNullChunk())
    {
       /**
        * a type wasn't identified and no closing brace is present; we're
@@ -2743,7 +2724,7 @@ void EnumStructUnionParser::try_post_identify_type()
        * a type has yet to be identified, so search for the last word
        * that hasn't been marked as a variable
        */
-      Chunk *type = nullptr;
+      Chunk *type = Chunk::NullChunkPtr;
       Chunk *pc   = m_start;
 
       do
@@ -2766,7 +2747,7 @@ void EnumStructUnionParser::try_post_identify_type()
          pc = pc->GetNextNcNnl();
       } while (chunk_is_between(pc, m_start, m_end));
 
-      if (type != nullptr)
+      if (type->IsNotNullChunk())
       {
          mark_type(type);
       }
@@ -2817,7 +2798,7 @@ bool EnumStructUnionParser::try_pre_identify_type()
       }
    }
 
-   if (pc == nullptr)
+   if (pc->IsNullChunk())
    {
       Chunk *next = m_start->GetNextNcNnl();
 
@@ -2912,8 +2893,7 @@ bool EnumStructUnionParser::try_pre_identify_type()
       }
    }
 
-   if (  pc != nullptr
-      && pc->IsNotNullChunk())
+   if (pc->IsNotNullChunk())
    {
       /**
        * the chunk preceding the previously selected chunk should indicate the type
@@ -2949,7 +2929,7 @@ bool EnumStructUnionParser::type_identified() const
 {
    LOG_FUNC_ENTRY();
 
-   return(m_type != nullptr);
+   return(m_type->IsNotNullChunk());
 } // EnumStructUnionParser::type_identified
 
 
@@ -2963,6 +2943,6 @@ bool EnumStructUnionParser::where_clause_detected() const
    auto *where_end   = get_where_end();
    auto *where_start = get_where_start();
 
-   return(  where_end != nullptr
-         && where_start != nullptr);
+   return(  where_end->IsNotNullChunk()
+         && where_start->IsNotNullChunk());
 } // EnumStructUnionParser::where_clause_detected
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/EnumStructUnionParser.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/EnumStructUnionParser.h
index 15536e67..136a0eb7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/EnumStructUnionParser.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/EnumStructUnionParser.h
@@ -279,7 +279,7 @@ private:
    /**
     * Marks all variable identifiers associated with the class/enum/struct/union
     */
-   void mark_variable(Chunk *variable, T_PcfFlags flags);
+   void mark_variable(Chunk *variable, PcfFlags flags);
 
 
    /**
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ListManager.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/ListManager.h
index 64bc5fd8..64bc5fd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/ListManager.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/ListManager.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/add_space_table.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/add_space_table.h
index d9c89388..47b54148 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/add_space_table.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/add_space_table.h
@@ -40,10 +40,6 @@ const no_space_table_t add_space_table[] =
    { 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                 },
@@ -100,7 +96,6 @@ const no_space_table_t add_space_table[] =
    { 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           },
@@ -291,7 +286,6 @@ const no_space_table_t add_space_table[] =
    { 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                 },
@@ -363,4 +357,19 @@ const no_space_table_t no_space_table[] =
    { CT_TYPENAME,       CT_TYPE         },
 };
 
+/**
+ * this table lists out all combos where nothing is to do
+ * CT_UNKNOWN is a wildcard.
+ *
+ * TODO: some of these are no longer needed.
+ */
+const no_space_table_t IGNORE_space_table[] =
+{
+   //{ CT_RPAREN_OPEN, CT_RPAREN_CLOSE},
+   //{ CT_RPAREN_OPEN, CT_UNKNOWN     },
+   //{ CT_UNKNOWN,     CT_RPAREN_CLOSE},
+   { CT_PAREN_CLOSE,    CT_SIZEOF},
+};
+
+
 // *INDENT-ON*
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align.cpp
index 66e5af3f..830c41b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align.cpp
@@ -118,49 +118,47 @@ void align_all()
 {
    LOG_FUNC_ENTRY();
 
-   log_rule_B("align_typedef_span");
-
    if (options::align_typedef_span() > 0)
    {
+      log_rule_B("align_typedef_span");
       align_typedefs(options::align_typedef_span());
    }
-   log_rule_B("align_left_shift");
 
    if (options::align_left_shift())
    {
+      log_rule_B("align_left_shift");
       align_left_shift();
    }
-   log_rule_B("align_eigen_comma_init");
 
    if (options::align_eigen_comma_init())
    {
+      log_rule_B("align_eigen_comma_init");
       align_eigen_comma_init();
    }
-   log_rule_B("align_oc_msg_colon_span");
 
    if (options::align_oc_msg_colon_span() > 0)
    {
+      log_rule_B("align_oc_msg_colon_span");
       align_oc_msg_colons();
    }
-   // Align variable definitions
-   log_rule_B("align_var_def_span");
-   log_rule_B("align_var_struct_span");
-   log_rule_B("align_var_class_span");
 
    if (  (options::align_var_def_span() > 0)
       || (options::align_var_struct_span() > 0)
       || (options::align_var_class_span() > 0))
    {
+      // Align variable definitions
+      log_rule_B("align_var_def_span");
+      log_rule_B("align_var_struct_span");
+      log_rule_B("align_var_class_span");
       align_var_def_brace(Chunk::GetHead(), options::align_var_def_span(), nullptr);
    }
-   // Align assignments
-   log_rule_B("align_enum_equ_span");
-   log_rule_B("align_assign_span");
-   log_rule_B("align_assign_thresh");
 
    if (  (options::align_enum_equ_span() > 0)
       || (options::align_assign_span() > 0))
    {
+      // Align assignments
+      log_rule_B("align_enum_equ_span");
+      log_rule_B("align_assign_span");
       align_assign(Chunk::GetHead(),
                    options::align_assign_span(),
                    options::align_assign_thresh(),
@@ -170,60 +168,63 @@ void align_all()
    if (  (options::align_braced_init_list_span() > 0)                   // Issue #750
       || (options::align_braced_init_list_thresh() > 0))
    {
+      // Align braced initializers lists
       align_braced_init_list(Chunk::GetHead(),
                              options::align_braced_init_list_span(),
                              options::align_braced_init_list_thresh(),
                              nullptr);
    }
-   // Align structure initializers
-   log_rule_B("align_struct_init_span");
 
    if (options::align_struct_init_span() > 0)
    {
+      // Align structure initializers
+      log_rule_B("align_struct_init_span");
       align_struct_initializers();
    }
-   // Align function prototypes
-   log_rule_B("align_func_proto_span");
-   log_rule_B("align_mix_var_proto");
 
    if (  (options::align_func_proto_span() > 0)
       && !options::align_mix_var_proto())
    {
+      // Align function prototypes
+      log_rule_B("align_func_proto_span");
+      log_rule_B("align_mix_var_proto");
       align_func_proto(options::align_func_proto_span());
    }
-   // Align function prototypes
-   log_rule_B("align_oc_msg_spec_span");
 
    if (options::align_oc_msg_spec_span() > 0)
    {
+      // Align OC message spec
+      log_rule_B("align_oc_msg_spec_span");
       align_oc_msg_spec(options::align_oc_msg_spec_span());
    }
-   // Align OC colons
-   log_rule_B("align_oc_decl_colon");
 
    if (options::align_oc_decl_colon())
    {
+      // Align OC colons
+      log_rule_B("align_oc_decl_colon");
       align_oc_decl_colon();
    }
-   log_rule_B("align_asm_colon");
 
    if (options::align_asm_colon())
    {
+      // Align ASM colons
+      log_rule_B("align_asm_colon");
       align_asm_colon();
    }
-   // Align variable definitions in function prototypes
-   log_rule_B("align_func_params");
-   log_rule_B("align_func_params_span");
 
    if (  options::align_func_params()
       || options::align_func_params_span() > 0)
    {
+      // Align variable definitions in function prototypes
+      log_rule_B("align_func_params");
+      log_rule_B("align_func_params_span");
       align_func_params();
    }
-   log_rule_B("align_same_func_call_params");
 
    if (options::align_same_func_call_params())
    {
+      // Align parameters in function call
+      log_rule_B("align_same_func_call_params");
       align_same_func_call_params();
    }
    // Just in case something was aligned out of order... do it again
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align.h
index 91e87f25..000fc935 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align.h
@@ -1,6 +1,6 @@
 /**
  * @file align.h
- * prototypes for align.c
+ * prototypes for align.cpp
  *
  * @author  Ben Gardner
  * @license GPL v2+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_add.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_add.cpp
index 48d20a05..ae8460d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_add.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_add.cpp
@@ -18,7 +18,7 @@ void align_add(ChunkStack &cs, Chunk *pc, size_t &max_col)
    size_t min_col;
    Chunk  *prev = Chunk::NullChunkPtr;
 
-   if (pc != nullptr)
+   if (pc->IsNotNullChunk())
    {
       prev = pc->GetPrev();
    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_add.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_add.h
index e178b5bd..e178b5bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_add.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_add.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_asm_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_asm_colon.cpp
index 4eaca4f3..4eaca4f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_asm_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_asm_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_asm_colon.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_asm_colon.h
index 2b0d3738..2b0d3738 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_asm_colon.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_asm_colon.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_assign.cpp
index 1943e353..b9012a2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_assign.cpp
@@ -21,12 +21,11 @@ Chunk *align_assign(Chunk *first, size_t span, size_t thresh, size_t *p_nl_count
 {
    LOG_FUNC_ENTRY();
 
-   if (  first == nullptr
-      || first->IsNullChunk())
+   if (first->IsNullChunk())
    {
       // coveralls will complain here. There are no example for that.
       // see https://en.wikipedia.org/wiki/Robustness_principle
-      return(nullptr);
+      return(Chunk::NullChunkPtr);
    }
    size_t my_level = first->GetLevel();
 
@@ -63,7 +62,7 @@ Chunk *align_assign(Chunk *first, size_t span, size_t thresh, size_t *p_nl_count
    size_t fcn_idx     = 0;
    size_t tmp;
    Chunk  *pc      = first;
-   Chunk  *vdas_pc = nullptr;
+   Chunk  *vdas_pc = Chunk::NullChunkPtr;
 
    while (pc->IsNotNullChunk())
    {
@@ -72,12 +71,12 @@ Chunk *align_assign(Chunk *first, size_t span, size_t thresh, size_t *p_nl_count
 
       if (nl_count != 0)
       {
-         if (vdas_pc != nullptr)
+         if (vdas_pc->IsNotNullChunk())
          {
             LOG_FMT(LALASS, "%s(%d): vdas.Add on '%s' on orig line %zu, orig col is %zu\n",
                     __func__, __LINE__, vdas_pc->Text(), vdas_pc->GetOrigLine(), vdas_pc->GetOrigCol());
             vdas.Add(vdas_pc);
-            vdas_pc = nullptr;
+            vdas_pc = Chunk::NullChunkPtr;
          }
 
          if (p_nl_count != nullptr)
@@ -172,7 +171,7 @@ Chunk *align_assign(Chunk *first, size_t span, size_t thresh, size_t *p_nl_count
          // we hit the second variable def and align was not requested - don't look for assigns, don't align
          LOG_FMT(LALASS, "%s(%d): multiple var defs found and alignment was not requested\n",
                  __func__, __LINE__);
-         vdas_pc = nullptr;
+         vdas_pc = Chunk::NullChunkPtr;
       }
       else if (  equ_count == 0                  // indent only if first '=' in line
               && !pc->TestFlags(PCF_IN_TEMPLATE) // and it is not inside a template #999
@@ -260,12 +259,12 @@ Chunk *align_assign(Chunk *first, size_t span, size_t thresh, size_t *p_nl_count
       pc = pc->GetNext();
    }
 
-   if (vdas_pc != nullptr)
+   if (vdas_pc->IsNotNullChunk())
    {
       LOG_FMT(LALASS, "%s(%d): vdas.Add on '%s' on orig line %zu, orig col is %zu\n",
               __func__, __LINE__, vdas_pc->Text(), vdas_pc->GetOrigLine(), vdas_pc->GetOrigCol());
       vdas.Add(vdas_pc);
-      vdas_pc = nullptr;
+      vdas_pc = Chunk::NullChunkPtr;
    }
    as.End();
    vdas.End();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_assign.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_assign.h
index 8a23d0d5..8a23d0d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_assign.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_assign.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_braced_init_list.cpp
index 5322586b..8071a3ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_braced_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_braced_init_list.cpp
@@ -19,12 +19,11 @@ Chunk *align_braced_init_list(Chunk *first, size_t span, size_t thresh, size_t *
 {
    LOG_FUNC_ENTRY();
 
-   if (  first == nullptr
-      || first->IsNullChunk())
+   if (first->IsNullChunk())
    {
       // coveralls will complain here. There are no example for that.
       // see https://en.wikipedia.org/wiki/Robustness_principle
-      return(nullptr);
+      return(Chunk::NullChunkPtr);
    }
    size_t my_level = first->GetLevel();
 
@@ -45,8 +44,7 @@ Chunk *align_braced_init_list(Chunk *first, size_t span, size_t thresh, size_t *
    size_t tmp;
    Chunk  *pc = first;
 
-   while (  pc != nullptr
-         && pc->IsNotNullChunk())
+   while (pc->IsNotNullChunk())
    {
       LOG_FMT(LALASS, "%s(%d): orig line is %zu, check pc->Text() is '%s', type is %s, parent type is %s\n",
               __func__, __LINE__, pc->GetOrigLine(), pc->ElidedText(copy), get_token_name(pc->GetType()), get_token_name(pc->GetParentType()));
@@ -154,8 +152,7 @@ Chunk *align_braced_init_list(Chunk *first, size_t span, size_t thresh, size_t *
    }
    vdas.End();
 
-   if (  pc != nullptr
-      && pc->IsNotNullChunk())
+   if (pc->IsNotNullChunk())
    {
       LOG_FMT(LALASS, "%s(%d): done on '%s' on orig line %zu\n",
               __func__, __LINE__, pc->Text(), pc->GetOrigLine());
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_braced_init_list.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_braced_init_list.h
index e29868e0..e29868e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_braced_init_list.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_braced_init_list.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_eigen_comma_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_eigen_comma_init.cpp
index d096a9a7..d096a9a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_eigen_comma_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_eigen_comma_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_eigen_comma_init.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_eigen_comma_init.h
index 6647f030..6647f030 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_eigen_comma_init.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_eigen_comma_init.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_func_params.cpp
index 50e04d78..50e04d78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_func_params.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_func_params.h
index 4beb8cbf..4beb8cbf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_func_params.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_func_params.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_func_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_func_proto.cpp
index f56cb254..ede4c70d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_func_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_func_proto.cpp
@@ -71,7 +71,7 @@ void align_func_proto(size_t span)
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
       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",
+      LOG_FMT(LAS, "%s(%d): orig line %zu, orig col %zu, text '%s', type %s, level %zu, brace level %zu\n",
               __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->ElidedText(copy),
               get_token_name(pc->GetType()), pc->GetLevel(), pc->GetBraceLevel());
 
@@ -93,6 +93,8 @@ void align_func_proto(size_t span)
       }
 
       if (  pc->IsNewline()
+         && (  !options::align_func_proto_span_ignore_cont_lines()
+            || !pc->GetNextNnl()->TestFlags(PCF_CONT_LINE))  // Issue #4131
          && !pc->TestFlags(PCF_IN_FCN_CALL))                 // Issue #2831
       {
          look_bro = false;
@@ -157,7 +159,7 @@ void align_func_proto(size_t span)
             toadd = pc;
          }
          Chunk *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",
+         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->GetOrigLine(), tmp->GetOrigCol(),
                  tmp->GetLevel(), tmp->GetBraceLevel());
          // test the Stack
@@ -176,6 +178,7 @@ void align_func_proto(size_t span)
             many_as.at(pc->GetLevel()).at(pc->GetBraceLevel()) = stack_at_l_bl;
          }
          stack_at_l_bl->Add(tmp);
+         stack_at_l_bl->Debug();
          log_rule_B("align_single_line_brace");
          look_bro = (pc->Is(CT_FUNC_DEF))
                     && options::align_single_line_brace();
@@ -193,8 +196,8 @@ void align_func_proto(size_t span)
             stack_at_l_bl_brace->m_gap                               = mybr_gap;
             many_as_brace.at(pc->GetLevel()).at(pc->GetBraceLevel()) = stack_at_l_bl_brace;
          }
-         stack_at_l_bl_brace->Debug();
          stack_at_l_bl_brace->Add(pc);
+         stack_at_l_bl_brace->Debug();
          look_bro = false;
       }
    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_func_proto.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_func_proto.h
index 811020e0..811020e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_func_proto.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_func_proto.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_init_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_init_brace.cpp
index 02d60f17..3d72af5f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_init_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_init_brace.cpp
@@ -24,7 +24,7 @@ void align_init_brace(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
-   Chunk *num_token = nullptr;
+   Chunk *num_token = Chunk::NullChunkPtr;
 
    cpd.al_cnt       = 0;
    cpd.al_c99_array = false;
@@ -35,7 +35,7 @@ void align_init_brace(Chunk *start)
    Chunk *pc       = start->GetNextNcNnl();
    Chunk *pcSingle = scan_ib_line(pc);
 
-   if (  pcSingle == nullptr
+   if (  pcSingle->IsNullChunk()
       || (  pcSingle->Is(CT_BRACE_CLOSE)
          && pcSingle->GetParentType() == CT_ASSIGN))
    {
@@ -58,8 +58,7 @@ void align_init_brace(Chunk *start)
       {
          pc = pc->GetNext();
       }
-   } while (  pc != nullptr
-           && pc->IsNotNullChunk()
+   } while (  pc->IsNotNullChunk()
            && pc->GetLevel() > start->GetLevel());
 
    // debug dump the current frame
@@ -81,7 +80,7 @@ void align_init_brace(Chunk *start)
       Chunk *tmp;
 
       if (  idx == 0
-         && ((tmp = skip_c99_array(pc)) != nullptr))
+         && ((tmp = skip_c99_array(pc))->IsNotNullChunk()))
       {
          pc = tmp;
 
@@ -114,7 +113,7 @@ void align_init_brace(Chunk *start)
                     __func__, __LINE__,
                     idx, get_token_name(pc->GetType()), get_token_name(cpd.al[idx].type), pc->Text(), cpd.al[idx].col);
 
-            if (num_token != nullptr)
+            if (num_token->IsNotNullChunk())
             {
                int col_diff = pc->GetColumn() - num_token->GetColumn();
 
@@ -124,7 +123,7 @@ void align_init_brace(Chunk *start)
                //        num_token->Text(), cpd.al[idx - 1].col, col_diff);
 
                num_token->SetFlagBits(PCF_WAS_ALIGNED);
-               num_token = nullptr;
+               num_token = Chunk::NullChunkPtr;
             }
 
             // Comma's need to 'fall back' to the previous token
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_init_brace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_init_brace.h
index c749eb54..c749eb54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_init_brace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_init_brace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_left_shift.cpp
index 6ac2175c..6ac2175c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_left_shift.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_left_shift.h
index d02155b0..d02155b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_left_shift.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_left_shift.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_log_al.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_log_al.cpp
index 802b0280..802b0280 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_log_al.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_log_al.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_log_al.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_log_al.h
index 8cb2ece8..8cb2ece8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_log_al.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_log_al.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_nl_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_nl_cont.cpp
index 8ff71508..8019fddf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_nl_cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_nl_cont.cpp
@@ -12,6 +12,13 @@
 #include "align_add.h"
 #include "uncrustify.h"
 
+#include <algorithm>                   // to get max
+#include <limits>
+
+
+using namespace std;
+using namespace uncrustify;
+
 
 Chunk *align_nl_cont(Chunk *start)
 {
@@ -20,10 +27,12 @@ Chunk *align_nl_cont(Chunk *start)
    LOG_FMT(LALNLC, "%s(%d): start on [%s] on line %zu\n",
            __func__, __LINE__, get_token_name(start->GetType()), start->GetOrigLine());
 
-   // Find the max column
+   // Decide which column to align to
    ChunkStack cs;
-   size_t     max_col = 0;
-   Chunk      *pc     = start;
+   size_t     align_col = 0;
+   size_t     min_col   = numeric_limits<size_t>::max();
+   size_t     max_col   = 0;
+   Chunk      *pc       = start;
 
    while (  pc->IsNotNullChunk()
          && pc->IsNot(CT_NEWLINE)
@@ -31,17 +40,29 @@ Chunk *align_nl_cont(Chunk *start)
    {
       if (pc->Is(CT_NL_CONT))
       {
-         align_add(cs, pc, max_col);
+         align_add(cs, pc, align_col);
+         min_col = min(min_col, pc->GetColumn());
+         max_col = max(max_col, pc->GetColumn());
       }
       pc = pc->GetNext();
    }
+   align_col = align_col - 1 + options::align_nl_cont_spaces();
+
+   if (options::align_nl_cont() == 2) // align with leftmost backslash
+   {
+      align_col = max(align_col, min_col);
+   }
+   else if (options::align_nl_cont() == 3) // align with rightmost backslash
+   {
+      align_col = max(align_col, max_col);
+   }
    // NL_CONT is always the last thing on a line
    Chunk *tmp;
 
-   while ((tmp = cs.Pop_Back()) != nullptr)
+   while ((tmp = cs.Pop_Back())->IsNotNullChunk())
    {
       tmp->SetFlagBits(PCF_WAS_ALIGNED);
-      tmp->SetColumn(max_col);
+      tmp->SetColumn(align_col);
    }
    return(pc);
 } // align_nl_cont
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_nl_cont.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_nl_cont.h
index 05a046ec..fb2db581 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_nl_cont.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_nl_cont.h
@@ -20,7 +20,7 @@
  *
  * @param start   Start point
  *
- * @return pointer the last item looked at (nullptr/newline/comment)
+ * @return pointer the last item looked at (null chunk/newline/comment)
  */
 Chunk *align_nl_cont(Chunk *start);
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_decl_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_oc_decl_colon.cpp
index 35b4b58e..35b4b58e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_decl_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_oc_decl_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_decl_colon.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_oc_decl_colon.h
index b44b11ee..b44b11ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_decl_colon.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_oc_decl_colon.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_msg_colons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_oc_msg_colons.cpp
index ffb6a4eb..85b509d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_msg_colons.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_oc_msg_colons.cpp
@@ -93,7 +93,7 @@ void align_oc_msg_colon(Chunk *so)
    // find the longest args that isn't the first one
    size_t first_len = 0;
    size_t mlen      = 0;
-   Chunk  *longest  = nullptr;
+   Chunk  *longest  = Chunk::NullChunkPtr;
 
    size_t len = nas.m_aligned.Len();
 
@@ -101,7 +101,7 @@ void align_oc_msg_colon(Chunk *so)
    {
       Chunk *tmp = nas.m_aligned.GetChunk(idx);
 
-      if (tmp != nullptr)
+      if (tmp->IsNotNullChunk())
       {
          size_t tlen = tmp->GetStr().size();
 
@@ -133,7 +133,7 @@ void align_oc_msg_colon(Chunk *so)
    // Align with first colon if possible by removing spaces
    log_rule_B("indent_oc_msg_prioritize_first_colon");
 
-   if (  longest != nullptr
+   if (  longest->IsNotNullChunk()
       && options::indent_oc_msg_prioritize_first_colon()
       && len_diff > 0
       && (  (longest->GetColumn() >= len_diff)
@@ -141,7 +141,7 @@ void align_oc_msg_colon(Chunk *so)
    {
       longest->SetColumn(longest->GetColumn() - len_diff);
    }
-   else if (  longest != nullptr
+   else if (  longest->IsNotNullChunk()
            && len > 0)
    {
       Chunk chunk;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_msg_colons.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_oc_msg_colons.h
index 0bbb7b6b..0bbb7b6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_msg_colons.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_oc_msg_colons.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_msg_spec.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_oc_msg_spec.cpp
index 88671254..88671254 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_msg_spec.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_oc_msg_spec.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_msg_spec.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_oc_msg_spec.h
index b6500a6e..b6500a6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_oc_msg_spec.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_oc_msg_spec.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_preprocessor.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_preprocessor.cpp
index 18a853ea..18a853ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_preprocessor.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_preprocessor.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_preprocessor.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_preprocessor.h
index 1095c94e..1095c94e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_preprocessor.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_preprocessor.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_same_func_call_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_same_func_call_params.cpp
index 6b17ab90..d0750ae4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_same_func_call_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_same_func_call_params.cpp
@@ -28,8 +28,8 @@ void align_same_func_call_params()
    size_t            span        = 3;
    size_t            thresh;
    Chunk             *align_fcn;
-   unc_text          align_fcn_name;
-   unc_text          align_root_name;
+   UncText           align_fcn_name;
+   UncText           align_root_name;
    deque<Chunk *>    chunks;
    deque<AlignStack> array_of_AlignStack;
    AlignStack        fcn_as;
@@ -51,14 +51,14 @@ void align_same_func_call_params()
 
    for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
-      if (pc->IsNewline())
+      if (pc->IsNewline())              // for debugging
       {
-         LOG_FMT(LAS, "%s(%d): orig line is %zu, <Newline>\n", __func__, __LINE__, pc->GetOrigLine());
+         LOG_FMT(LAS, "%s(%3d): orig line is %zu, <Newline>\n", __func__, __LINE__, pc->GetOrigLine());
       }
       else
       {
-         LOG_FMT(LAS, "%s(%d): orig line is %zu, orig col is %zu, pc->Text() '%s'\n",
-                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+         LOG_FMT(LAS, "%s(%3d): orig line is %zu, orig col is %zu, pc->Text() '%s', type is %s\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
       }
 
       if (pc->IsNot(CT_FUNC_CALL))
@@ -72,6 +72,16 @@ void align_same_func_call_params()
 
             fcn_as.NewLines(pc->GetNlCount());
          }
+         else if (pc->Is(CT_FUNC_CTOR_VAR))                             // Issue #3916
+         {
+            Chunk *open_paren  = pc->GetNextType(CT_FPAREN_OPEN, pc->GetLevel());
+            Chunk *close_paren = open_paren->GetClosingParen();
+            LOG_FMT(LAS, "%s(%3d): orig line is %zu, orig col is %zu, pc->Text() '%s', type is %s\n",
+                    __func__, __LINE__, open_paren->GetOrigLine(), open_paren->GetOrigCol(), open_paren->Text(), get_token_name(open_paren->GetType()));
+            LOG_FMT(LAS, "%s(%3d): orig line is %zu, orig col is %zu, pc->Text() '%s', type is %s\n",
+                    __func__, __LINE__, close_paren->GetOrigLine(), close_paren->GetOrigCol(), close_paren->Text(), get_token_name(close_paren->GetType()));
+            pc = close_paren;
+         }
          else
          {
             // if we drop below the brace level that started it, we are done
@@ -93,6 +103,7 @@ void align_same_func_call_params()
          }
          continue;
       }
+      // only if (pc->Is(CT_FUNC_CALL))
       // Only align function calls that are right after a newline
       Chunk *prev = pc->GetPrev();
 
@@ -124,7 +135,7 @@ void align_same_func_call_params()
          prev            = prev->GetNext();
       }
       align_fcn_name += pc->GetStr();
-      LOG_FMT(LASFCP, "%s(%d): Func Call found at orig line is %zu, orig col is %zu, c_str() '%s'\n",
+      LOG_FMT(LASFCP, "%s(%3d): Func Call found at orig line is %zu, orig col is %zu, c_str() '%s'\n",
               __func__, __LINE__, align_fcn->GetOrigLine(),
               align_fcn->GetOrigCol(),
               align_fcn_name.c_str());
@@ -136,14 +147,15 @@ void align_same_func_call_params()
          // Issue # 1395
          // can only align functions on the same brace level
          // and on the same level
-         LOG_FMT(LASFCP, "%s(%d):align_root is not nullptr\n", __func__, __LINE__);
+         LOG_FMT(LASFCP, "%s(%d): align_root is not NullChunk\n", __func__, __LINE__);
 
          if (  align_root->GetBraceLevel() == pc->GetBraceLevel()
             && align_root->GetLevel() == pc->GetLevel()
             && align_fcn_name.equals(align_root_name))
          {
+            //WITH_STACKID_DEBUG;
             fcn_as.Add(pc);
-            align_cur->AlignmentData().next = pc;
+            align_cur->AlignData().next = pc;
             align_cur = pc;
             align_len++;
             add_str = "  Add";
@@ -167,7 +179,8 @@ void align_same_func_call_params()
 
       if (align_root->IsNullChunk())
       {
-         LOG_FMT(LASFCP, "%s(%d):align_root is null chunk, Add pc '%s'\n", __func__, __LINE__, pc->Text());
+         LOG_FMT(LASFCP, "%s(%d): align_root is null chunk, Add pc '%s'\n",
+                 __func__, __LINE__, pc->Text());
          fcn_as.Add(pc);
          align_root      = align_fcn;
          align_root_name = align_fcn_name;
@@ -175,27 +188,12 @@ void align_same_func_call_params()
          align_len       = 1;
          add_str         = "Start";
       }
-      LOG_FMT(LASFCP, "%s(%d):\n", __func__, __LINE__);
 
       if (add_str != nullptr)
       {
-         LOG_FMT(LASFCP, "%s(%d): %s with function '%s', on orig line %zu, ",
+         LOG_FMT(LASFCP, "%s(%3d): %s with function '%s', on orig line %zu\n",
                  __func__, __LINE__, add_str, align_fcn_name.c_str(), pc->GetOrigLine());
          align_params(pc, chunks);
-         LOG_FMT(LASFCP, "%zu items:", chunks.size());
-
-         for (size_t idx = 0; idx < chunks.size(); idx++)
-         {
-            // show the chunk(s)
-            LOG_FMT(LASFCP, " [%s]", chunks[idx]->Text());
-
-            if (idx < chunks.size() - 1)
-            {
-               LOG_FMT(LASFCP, ",");
-            }
-         }
-
-         LOG_FMT(LASFCP, "\n");
 
          for (size_t idx = 0; idx < chunks.size(); idx++)
          {
@@ -259,6 +257,9 @@ void align_params(Chunk *start, deque<Chunk *> &chunks)
 
    while ((pc = pc->GetNext())->IsNotNullChunk())
    {
+      LOG_FMT(LAS, "%s(%3d): orig line is %zu, orig col is %zu, pc->Text() '%s'\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
+
       if (  pc->IsNewline()
          || pc->Is(CT_SEMICOLON)
          || (  pc->Is(CT_FPAREN_CLOSE)
@@ -271,6 +272,8 @@ void align_params(Chunk *start, deque<Chunk *> &chunks)
       {
          if (hit_comma)
          {
+            LOG_FMT(LAS, "%s(%3d): hit_comma, orig line is %zu, orig col is %zu, pc->Text() '%s'\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
             chunks.push_back(pc);
             hit_comma = false;
          }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_same_func_call_params.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_same_func_call_params.h
index 648d7174..d308b0b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_same_func_call_params.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_same_func_call_params.h
@@ -11,6 +11,7 @@
 #define ALIGN_SAME_FUNC_CALL_PARAMS_H_INCLUDED
 
 #include "ChunkStack.h"
+
 #include <deque>
 
 using namespace std;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_stack.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_stack.cpp
index 4ed5da0a..72cbc29d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_stack.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_stack.cpp
@@ -28,14 +28,14 @@ void AlignStack::Start(size_t span, int thresh)
    stackID = get_A_Number();   // for debugging purpose only
 
    // produces much more log output. Use it only debugging purpose
-   //WITH_STACKID_DEBUG;
+   // WITH_STACKID_DEBUG;
 
    //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__);
    m_skipped.Reset();
 
-   if (thresh > 0)
+   if (thresh >= 0)
    {
       m_absolute_thresh = false;
       m_thresh          = thresh;
@@ -54,13 +54,13 @@ void AlignStack::Start(size_t span, int thresh)
    m_right_align = false;
    m_star_style  = SS_IGNORE;
    m_amp_style   = SS_IGNORE;
-}
+} // AlignStack::Start
 
 
 void AlignStack::ReAddSkipped()
 {
    // produces much more log output. Use it only debugging purpose
-   //WITH_STACKID_DEBUG;
+   // WITH_STACKID_DEBUG;
 
    if (m_skipped.Empty())
    {
@@ -80,25 +80,23 @@ void AlignStack::ReAddSkipped()
    }
 
    NewLines(0); // Check to see if we need to flush right away
-}
+} // AlignStack::ReAddSkipped
 
 
 void AlignStack::Add(Chunk *start, size_t seqnum)
 {
    // produces much more log output. Use it only debugging purpose
-   //WITH_STACKID_DEBUG;
+   // 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",
+   LOG_FMT(LAS, "AlignStack::%s(%d): Candidate '%s': orig line %zu, column %zu, type %s, level %zu\n",
            __func__, __LINE__, start->Text(), start->GetOrigLine(), start->GetColumn(), get_token_name(start->GetType()), start->GetLevel());
-   LOG_FMT(LAS, "AlignStack::%s(%d): seqnum is %zu\n", __func__, __LINE__, seqnum);
+   LOG_FMT(LAS, "AlignStack::%s(%d): seqnum %zu m_seqnum %zu\n", __func__, __LINE__, seqnum, m_seqnum);
 
    // Assign a seqnum if needed
    if (seqnum == 0)
    {
-      LOG_FMT(LAS, "AlignStack::%s(%d): m_seqnum is %zu\n", __func__, __LINE__, m_seqnum);
       seqnum = m_seqnum;
-      LOG_FMT(LAS, "AlignStack::%s(%d): seqnum is %zu\n", __func__, __LINE__, seqnum);
    }
    m_last_added = 0;
 
@@ -160,7 +158,6 @@ void AlignStack::Add(Chunk *start, size_t seqnum)
     *
     * If align_on_tabstop=true, then SS_DANGLE is changed to SS_INCLUDE.
     */
-   log_rule_B("align_on_tabstop");
 
    if (  options::align_on_tabstop()
       && m_star_style == SS_DANGLE)
@@ -170,17 +167,18 @@ void AlignStack::Add(Chunk *start, size_t seqnum)
    LOG_FMT(LAS, "AlignStack::%s(%d): m_star_style is %s\n",
            __func__, __LINE__, get_StarStyle_name(m_star_style));
    // Find ref. Back up to the real item that is aligned.
-   Chunk *prev = start;
+   Chunk *prev = start->GetPrev();
 
-   while (  (prev = prev->GetPrev())->IsNotNullChunk()
-         && (  prev->IsPointerOperator()
-            || prev->Is(CT_TPAREN_OPEN)))
+   while (  prev->IsPointerOperator()
+         || prev->Is(CT_TPAREN_OPEN))
    {
-      // do nothing - we want prev when this exits
+      prev = prev->GetPrev();
    }
 
    if (prev->IsNullChunk())
    {
+      LOG_FMT(LAS, "AlignStack::%s(%d): 'ref' chunk not found. Do not add.\n",
+              __func__, __LINE__);
       return;
    }
    Chunk *ref = prev;
@@ -190,12 +188,7 @@ void AlignStack::Add(Chunk *start, size_t seqnum)
       ref = ref->GetNext();
    }
    // Find the item that we are going to align.
-   Chunk *ali = Chunk::NullChunkPtr;
-
-   if (start != nullptr)
-   {
-      ali = start;
-   }
+   Chunk *ali = start;
 
    if (m_star_style != SS_IGNORE)
    {
@@ -230,6 +223,10 @@ void AlignStack::Add(Chunk *start, size_t seqnum)
          tmp_prev = ali->GetPrev();
       }
    }
+   LOG_FMT(LAS, "AlignStack::%s(%3d): 'ref' orig line %zu, orig col %zu, text '%s', level %zu, type %s\n",
+           __func__, __LINE__, ref->GetOrigLine(), ref->GetOrigCol(), ref->Text(), ref->GetLevel(), get_token_name(ref->GetType()));
+   LOG_FMT(LAS, "AlignStack::%s(%3d): 'ali' orig line %zu, orig col %zu, text '%s', level %zu, type %s\n",
+           __func__, __LINE__, ali->GetOrigLine(), ali->GetOrigCol(), ali->Text(), ali->GetLevel(), get_token_name(ali->GetType()));
    log_rule_B("align_keep_extra_space");
 
    // Tighten down the spacing between ref and start
@@ -237,7 +234,7 @@ void AlignStack::Add(Chunk *start, size_t seqnum)
    {
       size_t tmp_col = ref->GetColumn();
       Chunk  *tmp    = ref;
-      LOG_FMT(LAS, "AlignStack::%s(%d): tmp_col is %zu\n",
+      LOG_FMT(LAS, "AlignStack::%s(%3d): tmp_col is %zu\n",
               __func__, __LINE__, tmp_col);
 
       while (  tmp->IsNotNullChunk()
@@ -247,21 +244,23 @@ void AlignStack::Add(Chunk *start, size_t seqnum)
 
          if (next->IsNotNullChunk())
          {
-            LOG_FMT(LAS, "AlignStack::%s(%d): next orig line is %zu, orig col is %zu, Text() '%s', level is %zu, type is %s\n",
+            LOG_FMT(LAS, "AlignStack::%s(%3d): 'next' orig line %zu, orig col %zu, text '%s', level %zu, type %s\n",
                     __func__, __LINE__, next->GetOrigLine(), next->GetOrigCol(), next->Text(), next->GetLevel(), get_token_name(next->GetType()));
             tmp_col += space_col_align(tmp, next);
-            LOG_FMT(LAS, "AlignStack::%s(%d): next column is %zu, level is %zu, tmp_col is %zu\n",
+            LOG_FMT(LAS, "AlignStack::%s(%3d): 'next' column %zu, level %zu, tmp_col %zu\n",
                     __func__, __LINE__, next->GetColumn(), next->GetLevel(), tmp_col);
 
             if (next->GetColumn() != tmp_col)
             {
-               LOG_FMT(LAS, "AlignStack::%s(%d): Call align_to_column\n", __func__, __LINE__);
+               LOG_FMT(LAS, "AlignStack::%s(%3d): call align_to_column\n", __func__, __LINE__);
                align_to_column(next, tmp_col);
             }
          }
          tmp = next;
       }
    }
+   LOG_FMT(LAS, "AlignStack::%s(%3d): m_min_col %zu, m_max_col %zu, start_col %zu, m_thresh %zu, m_gap %zu\n",
+           __func__, __LINE__, m_min_col, m_max_col, start->GetColumn(), m_thresh, m_gap);
 
    // Check threshold limits
    if (  m_max_col == 0
@@ -306,37 +305,37 @@ void AlignStack::Add(Chunk *start, size_t seqnum)
       const size_t endcol = ali->GetColumn() + col_adj
                             + (gap < m_gap ? m_gap - gap : 0);
 
-      ali->AlignmentData().col_adj = col_adj;
-      ali->AlignmentData().ref     = ref;
-      ali->AlignmentData().start   = start;
+      ali->AlignData().col_adj = col_adj;
+      ali->AlignData().ref     = ref;
+      ali->AlignData().start   = start;
       m_aligned.Push_Back(ali, seqnum);
       m_last_added = 1;
 
       // Issue #2278
       if (ali->Is(CT_PTR_TYPE))
       {
-         LOG_FMT(LAS, "AlignStack::%s(%d): Add-[%s][%s]: ali orig line is %zu, column is %zu, type is %s, level is %zu\n",
+         LOG_FMT(LAS, "AlignStack::%s(%d): add [%s][%s]: 'ali' orig line %zu, column %zu, type %s, level %zu\n",
                  __func__, __LINE__, ali->Text(), start->Text(), ali->GetOrigLine(), ali->GetColumn(), get_token_name(ali->GetType()), ali->GetLevel());
       }
       else
       {
-         LOG_FMT(LAS, "AlignStack::%s(%d): Add-[%s]: ali orig line is %zu, column is %zu, type is %s, level is %zu\n",
+         LOG_FMT(LAS, "AlignStack::%s(%3d): add [%s]: 'ali' orig line %zu, column %zu, type %s, level %zu\n",
                  __func__, __LINE__, ali->Text(), ali->GetOrigLine(), ali->GetColumn(), get_token_name(ali->GetType()), ali->GetLevel());
       }
-      LOG_FMT(LAS, "AlignStack::%s(%d):    ali alignment col_adj is %d, ref '%s', endcol is %zu\n",
-              __func__, __LINE__, ali->GetAlignmentData().col_adj, ref->Text(), endcol);
+      LOG_FMT(LAS, "AlignStack::%s(%3d): 'ali' alignment col_adj %d, ref '%s', endcol %zu\n",
+              __func__, __LINE__, ali->GetAlignData().col_adj, ref->Text(), endcol);
 
       if (m_min_col > endcol)
       {
          m_min_col = endcol;
       }
+      LOG_FMT(LAS, "AlignStack::%s(%3d): add aligned: seqnum %zu, m_nl_seqnum %zu, m_seqnum %zu\n",
+              __func__, __LINE__, seqnum, m_nl_seqnum, m_seqnum);
+      LOG_FMT(LAS, "AlignStack::%s(%3d): 'ali' orig line %zu, column %zu, m_min_col %zu, max_col old/new %zu/%zu\n",
+              __func__, __LINE__, ali->GetOrigLine(), ali->GetColumn(), m_min_col, m_max_col, endcol);
 
       if (endcol > m_max_col)
       {
-         LOG_FMT(LAS, "AlignStack::%s(%d): Add-aligned: seqnum is %zu, m_nl_seqnum is %zu, m_seqnum is %zu\n",
-                 __func__, __LINE__, seqnum, m_nl_seqnum, m_seqnum);
-         LOG_FMT(LAS, "AlignStack::%s(%d):    ali orig line is %zu, column is %zu, max_col old is %zu, new is %zu, m_min_col is %zu\n",
-                 __func__, __LINE__, ali->GetOrigLine(), ali->GetColumn(), m_max_col, endcol, m_min_col);
          m_max_col = endcol;
 
          /*
@@ -345,67 +344,65 @@ void AlignStack::Add(Chunk *start, size_t seqnum)
           */
          if (!m_skipped.Empty())
          {
+            LOG_FMT(LAS, "AlignStack::%s(%3d): ReAddSkipped()\n", __func__, __LINE__);
             ReAddSkipped();
          }
       }
-      else
-      {
-         LOG_FMT(LAS, "AlignStack::%s(%d): Add-aligned: seqnum is %zu, m_nl_seqnum is %zu, m_seqnum is %zu\n",
-                 __func__, __LINE__, seqnum, m_nl_seqnum, m_seqnum);
-         LOG_FMT(LAS, "AlignStack::%s(%d):    ali orig line is %zu, column is %zu, max_col old is %zu, new is %zu, m_min_col is %zu\n",
-                 __func__, __LINE__, ali->GetOrigLine(), ali->GetColumn(), m_max_col, endcol, m_min_col);
-      }
    }
    else
    {
-      // The threshold check failed, so add it to the skipped list
+      // The threshold check failed, so add it to the skipped l
       m_skipped.Push_Back(start, seqnum);
       m_last_added = 2;
 
-      LOG_FMT(LAS, "AlignStack::Add-skipped [%zu/%zu/%zu]: line %zu, col %zu <= %zu + %zu\n",
+      LOG_FMT(LAS, "AlignStack::add skipped [%zu/%zu/%zu]: line %zu, col %zu <= %zu + %zu\n",
               seqnum, m_nl_seqnum, m_seqnum,
               start->GetOrigLine(), start->GetColumn(), m_max_col, m_thresh);
    }
+   LOG_FMT(LAS, "AlignStack::%s(%3d): end of add\n", __func__, __LINE__);
    // produces much more log output. Use it only debugging purpose
-   //WITH_STACKID_DEBUG;
 } // AlignStack::Add
 
 
 void AlignStack::NewLines(size_t cnt)
 {
    // produces much more log output. Use it only debugging purpose
-   //WITH_STACKID_DEBUG;
+   // 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, empty\n", __LINE__);
       return;
    }
-   LOG_FMT(LAS, "AlignStack::Newlines(%d): cnt is %zu\n", __LINE__, cnt);
+   LOG_FMT(LAS, "AlignStack::Newlines(%d): cnt %zu\n", __LINE__, cnt);
    m_seqnum += cnt;
-   LOG_FMT(LAS, "AlignStack::Newlines(%d): m_seqnum is %zu, m_nl_seqnum is %zu, m_span is %zu\n",
+   LOG_FMT(LAS, "AlignStack::Newlines(%d): m_seqnum %zu, m_nl_seqnum %zu, m_span %zu\n",
            __LINE__, m_seqnum, m_nl_seqnum, m_span);
 
    if (m_seqnum > (m_nl_seqnum + m_span))
    {
-      LOG_FMT(LAS, "AlignStack::Newlines(%d): cnt is %zu\n", __LINE__, cnt);
+      LOG_FMT(LAS, "AlignStack::Newlines(%d): cnt %zu\n", __LINE__, cnt);
       Flush();
    }
-}
+} // AlignStack::NewLines
 
 
 void AlignStack::Flush()
 {
    // produces much more log output. Use it only debugging purpose
-   //WITH_STACKID_DEBUG;
+   // WITH_STACKID_DEBUG;
 
    LOG_FMT(LAS, "AlignStack::%s(%d): Len() is %zu\n",
            __func__, __LINE__, Len());
 
    if (Len() > 0)
    {
-      LOG_FMT(LAS, "   (min is %zu, max is %zu)\n",
-              m_min_col, m_max_col);
+      LOG_FMT(LAS, "AlignStack::%s(%d):   min is %zu, max is %zu\n",
+              __func__, __LINE__, m_min_col, m_max_col);
+   }
+   else
+   {
+      return;
    }
 
    if (Len() == 1)
@@ -427,15 +424,14 @@ void AlignStack::Flush()
    m_max_col    = 0;
 
    // 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",
+   LOG_FMT(LAS, "AlignStack::%s(%d): Debug the stack, Len() is %zu\n",
            __func__, __LINE__, Len());
 
    for (size_t idx = 0; idx < Len(); idx++)
    {
       Chunk *pc = m_aligned.Get(idx)->m_pc;
-      LOG_FMT(LAS, "AlignStack::%s(%d): idx is %zu, pc->Text() is '%s', pc alignment col_adj is %d\n",
-              __func__, __LINE__, idx, pc->Text(), pc->GetAlignmentData().col_adj);
+      LOG_FMT(LAS, "AlignStack::%s(%d):   idx is %zu, pc->Text() is '%s', orig line is %zu, orig col is %zu, alignment col_adj is %d\n",
+              __func__, __LINE__, idx, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol(), pc->GetAlignData().col_adj);
    }
 
    // Recalculate the max_col - it may have shifted since the last Add()
@@ -447,9 +443,9 @@ void AlignStack::Flush()
       size_t col_adj = 0;
       size_t gap     = 0;
 
-      if (pc != pc->GetAlignmentData().ref)
+      if (pc != pc->GetAlignData().ref)
       {
-         gap = pc->GetColumn() - (pc->GetAlignmentData().ref->GetColumn() + pc->GetAlignmentData().ref->Len());
+         gap = pc->GetColumn() - (pc->GetAlignData().ref->GetColumn() + pc->GetAlignData().ref->Len());
       }
 
       if (m_star_style == SS_DANGLE)
@@ -458,21 +454,21 @@ void AlignStack::Flush()
 
          if (tmp->IsPointerOperator())
          {
-            col_adj = pc->GetAlignmentData().start->GetColumn() - pc->GetColumn();
-            gap     = pc->GetAlignmentData().start->GetColumn() - (pc->GetAlignmentData().ref->GetColumn() + pc->GetAlignmentData().ref->Len());
+            col_adj = pc->GetAlignData().start->GetColumn() - pc->GetColumn();
+            gap     = pc->GetAlignData().start->GetColumn() - (pc->GetAlignData().ref->GetColumn() + pc->GetAlignData().ref->Len());
          }
       }
 
       if (m_right_align)
       {
          // Adjust the width for signed numbers
-         if (pc->GetAlignmentData().start != nullptr)
+         if (pc->GetAlignData().start->IsNotNullChunk())
          {
-            size_t start_len = pc->GetAlignmentData().start->Len();
+            size_t start_len = pc->GetAlignData().start->Len();
 
-            if (pc->GetAlignmentData().start->GetType() == CT_NEG)
+            if (pc->GetAlignData().start->GetType() == CT_NEG)
             {
-               Chunk *next = pc->GetAlignmentData().start->GetNext();
+               Chunk *next = pc->GetAlignData().start->GetNext();
 
                if (next->Is(CT_NUMBER))
                {
@@ -482,7 +478,7 @@ void AlignStack::Flush()
             col_adj += start_len;
          }
       }
-      pc->AlignmentData().col_adj = col_adj;
+      pc->AlignData().col_adj = col_adj;
 
       // See if this pushes out the max_col
       const size_t endcol = pc->GetColumn() + col_adj
@@ -501,24 +497,24 @@ void AlignStack::Flush()
    {
       m_max_col = align_tab_column(m_max_col);
    }
-   LOG_FMT(LAS, "AlignStack::%s(%d): Len() is %zu\n",
+   LOG_FMT(LAS, "AlignStack::%s(%d): Debug the stack, Len() is %zu\n",
            __func__, __LINE__, Len());
 
-   const ChunkStack::Entry *ce = nullptr;
-
    for (size_t idx = 0; idx < Len(); idx++)
    {
-      ce = m_aligned.Get(idx);
-      LOG_FMT(LAS, "AlignStack::%s(%d): idx is %zu, ce->m_pc->Text() is '%s', orig line is %zu, orig col is %zu, alignment col_adj is %d\n",
-              __func__, __LINE__, idx, ce->m_pc->Text(), ce->m_pc->GetOrigLine(), ce->m_pc->GetOrigCol(), ce->m_pc->GetAlignmentData().col_adj);
+      Chunk *pc = m_aligned.Get(idx)->m_pc;
+      LOG_FMT(LAS, "AlignStack::%s(%d):   idx is %zu, pc->Text() is '%s', orig line is %zu, orig col is %zu, alignment col_adj is %d\n",
+              __func__, __LINE__, idx, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol(), pc->GetAlignData().col_adj);
    }
 
+   const ChunkStack::Entry *ce = nullptr;
+
    for (size_t idx = 0; idx < Len(); idx++)
    {
       ce = m_aligned.Get(idx);
       Chunk        *pc = ce->m_pc;
 
-      const size_t tmp_col = m_max_col - pc->GetAlignmentData().col_adj;
+      const size_t tmp_col = m_max_col - pc->GetAlignData().col_adj;
 
       if (idx == 0)
       {
@@ -535,16 +531,16 @@ void AlignStack::Flush()
          }
          pc->SetFlagBits(PCF_ALIGN_START);
 
-         pc->AlignmentData().right_align = m_right_align;
-         pc->AlignmentData().amp_style   = m_amp_style;
-         pc->AlignmentData().star_style  = m_star_style;
+         pc->AlignData().right_align = m_right_align;
+         pc->AlignData().amp_style   = m_amp_style;
+         pc->AlignData().star_style  = m_star_style;
       }
-      pc->AlignmentData().gap  = m_gap;
-      pc->AlignmentData().next = m_aligned.GetChunk(idx + 1);
+      pc->AlignData().gap  = m_gap;
+      pc->AlignData().next = m_aligned.GetChunk(idx + 1);
 
       // Indent the token, taking col_adj into account
       LOG_FMT(LAS, "AlignStack::%s(%d): orig line is %zu, orig col is %zu, Text() '%s', set to col %zu (adj is %d)\n",
-              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), tmp_col, pc->GetAlignmentData().col_adj);
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), tmp_col, pc->GetAlignData().col_adj);
       align_to_column(pc, tmp_col);
    }
 
@@ -584,17 +580,17 @@ void AlignStack::Flush()
 
 void AlignStack::Reset()
 {
-   //WITH_STACKID_DEBUG;
+   // 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__);
    m_skipped.Reset();
-}
+} // AlignStack::Reset
 
 
 void AlignStack::End()
 {
-   //WITH_STACKID_DEBUG;
+   // WITH_STACKID_DEBUG;
 
    if (!m_aligned.Empty())
    {
@@ -605,18 +601,19 @@ void AlignStack::End()
    m_aligned.Reset();
    //LOG_FMT(LAS, "AlignStack::End(%d):m_skipped.Reset()\n", __LINE__);
    m_skipped.Reset();
-}
+} // AlignStack::End
 
 
 size_t AlignStack::Len()
 {
+   // WITH_STACKID_DEBUG;
    return(m_aligned.Len());
-}
+} // AlignStack::Len
 
 
 void AlignStack::Debug()
 {
-   //WITH_STACKID_DEBUG;
+   // WITH_STACKID_DEBUG;
 
    size_t length = Len();
 
@@ -641,11 +638,12 @@ void AlignStack::Debug()
          }
       }
    }
-}
+} // AlignStack::Debug
 
 
 const char *AlignStack::get_StarStyle_name(StarStyle star_style)
 {
+   // WITH_STACKID_DEBUG;
    switch (star_style)
    {
    case StarStyle::SS_IGNORE:
@@ -658,4 +656,4 @@ const char *AlignStack::get_StarStyle_name(StarStyle star_style)
       return("SS_DANGLE");
    }
    return("?????");
-} // get_StarStyle_name
+} // AlignStack::get_StarStyle_name
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_stack.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_stack.h
index 6d079fe5..6d079fe5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_stack.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_stack.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_struct_initializers.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_struct_initializers.cpp
index ca032bc3..ca032bc3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_struct_initializers.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_struct_initializers.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_struct_initializers.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_struct_initializers.h
index 7310d072..7310d072 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_struct_initializers.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_struct_initializers.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_tab_column.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_tab_column.cpp
index 8d91b0ff..8d91b0ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_tab_column.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_tab_column.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_tab_column.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_tab_column.h
index 9e57baa0..9e57baa0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_tab_column.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_tab_column.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_tools.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_tools.cpp
index 2a3bbc09..e90afd2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_tools.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_tools.cpp
@@ -24,20 +24,20 @@ Chunk *skip_c99_array(Chunk *sq_open)
          return(tmp->GetNextNc());
       }
    }
-   return(nullptr);
+   return(Chunk::NullChunkPtr);
 } // skip_c99_array
 
 
 Chunk *scan_ib_line(Chunk *start)
 {
    LOG_FUNC_ENTRY();
-   Chunk  *prev_match = nullptr;
+   Chunk  *prev_match = Chunk::NullChunkPtr;
    size_t idx         = 0;
 
    // Skip past C99 "[xx] =" stuff
    Chunk *tmp = skip_c99_array(start);
 
-   if (tmp != nullptr)
+   if (tmp->IsNotNullChunk())
    {
       start->SetParentType(CT_TSQUARE);
       start            = tmp;
@@ -45,7 +45,7 @@ Chunk *scan_ib_line(Chunk *start)
    }
    Chunk *pc = start;
 
-   if (pc != nullptr)
+   if (pc->IsNotNullChunk())
    {
       LOG_FMT(LSIB, "%s(%d): start: orig line is %zu, orig col is %zu, column is %zu, type is %s\n",
               __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->GetColumn(), get_token_name(pc->GetType()));
@@ -114,7 +114,7 @@ Chunk *scan_ib_line(Chunk *start)
                        __func__, __LINE__, idx, pc->GetOrigLine(), pc->GetColumn(), token_width, get_token_name(pc->GetType()));
 
                // Shift out based on column
-               if (prev_match == nullptr)
+               if (prev_match->IsNullChunk())
                {
                   if (pc->GetColumn() > cpd.al[idx].col)
                   {
@@ -180,15 +180,10 @@ void ib_shift_out(size_t idx, size_t num)
 
 Chunk *step_back_over_member(Chunk *pc)
 {
-   if (pc == nullptr)
-   {
-      pc = Chunk::NullChunkPtr;
-   }
    Chunk *tmp = pc->GetPrevNcNnl();
 
    // Skip over any class stuff: bool CFoo::bar()
-   while (  tmp->IsNotNullChunk()
-         && tmp->Is(CT_DC_MEMBER))
+   while (tmp->Is(CT_DC_MEMBER))
    {
       pc  = tmp->GetPrevNcNnl();
       tmp = pc->GetPrevNcNnl();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_tools.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_tools.h
index 6153ba34..897e2da2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_tools.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_tools.h
@@ -29,7 +29,7 @@
  * @param chunk  chunk to operate on
  *
  * @return the chunk after the '=' if the check succeeds
- * @return nullptr in all other cases
+ * @return Chunk::NullChunkPtr in all other cases
  */
 Chunk *skip_c99_array(Chunk *sq_open);
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_trailing_comments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_trailing_comments.cpp
index 777c3dee..86b875eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_trailing_comments.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_trailing_comments.cpp
@@ -37,7 +37,7 @@ void align_stack(ChunkStack &cs, size_t col, bool align_single, log_sev_t sev)
       LOG_FMT(sev, "%s(%d): max_col=%zu\n", __func__, __LINE__, col);
       Chunk *pc;
 
-      while ((pc = cs.Pop_Back()) != nullptr)
+      while ((pc = cs.Pop_Back())->IsNotNullChunk())
       {
          align_to_column(pc, col);
          pc->SetFlagBits(PCF_WAS_ALIGNED);
@@ -154,7 +154,7 @@ comment_align_e get_comment_align_type(Chunk *cmt)
    log_rule_B("align_right_cmt_mix");
 
    if (  !options::align_right_cmt_mix()
-      && cmt != nullptr
+      && cmt->IsNotNullChunk()
       && ((prev = cmt->GetPrev())->IsNotNullChunk()))
    {
       if (  prev->Is(CT_PP_ENDIF)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_trailing_comments.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_trailing_comments.h
index 4fec7b8b..4fec7b8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_trailing_comments.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_trailing_comments.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_typedefs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_typedefs.cpp
index b97d9ddf..b97d9ddf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_typedefs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_typedefs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_typedefs.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_typedefs.h
index 2902d0d2..2902d0d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_typedefs.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_typedefs.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_var_def_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_var_def_brace.cpp
index a8cc2563..93eb34b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_var_def_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_var_def_brace.cpp
@@ -24,7 +24,7 @@ Chunk *align_var_def_brace(Chunk *start, size_t span, size_t *p_nl_count)
 
    if (start->IsNullChunk())
    {
-      return(nullptr);
+      return(Chunk::NullChunkPtr);
    }
    Chunk  *next;
    size_t myspan   = span;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_var_def_brace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_var_def_brace.h
index 6d06adf9..6d06adf9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/align_var_def_brace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/align_var_def_brace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/args.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/args.cpp
index a03bbe00..a03bbe00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/args.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/args.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/args.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/args.h
index 712fbd59..712fbd59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/args.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/args.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/backup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/backup.cpp
index 93a19c6a..93a19c6a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/backup.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/backup.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/backup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/backup.h
index 0d385649..0d385649 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/backup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/backup.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/base_types.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/base_types.h
index 1e98b0ac..1e98b0ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/base_types.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/base_types.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/brace_cleanup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/brace_cleanup.cpp
index 2cfe2ac2..565dae46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/brace_cleanup.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/brace_cleanup.cpp
@@ -11,9 +11,9 @@
 #include "brace_cleanup.h"
 
 #include "flag_parens.h"
-#include "frame_list.h"
 #include "keywords.h"
 #include "lang_pawn.h"
+#include "parsing_frame_stack.h"
 #include "prototypes.h"
 
 #include <stdexcept>            // to get std::invalid_argument
@@ -28,20 +28,12 @@ using std::to_string;
 using std::stringstream;
 
 
-/*
- * abbreviations used:
- * - sparen = tbd
- * - PS     = Parenthesis Stack
- * - pse    = Parenthesis Stack
- */
-
-
 struct BraceState
 {
-   std::vector<ParseFrame> frames     = {};
-   E_Token                 in_preproc = CT_NONE;
-   int                     pp_level   = 0;
-   bool                    consumed   = false;
+   ParsingFrameStack frames;
+   E_Token           in_preproc = CT_NONE;
+   int               pp_level   = 0;
+   bool              consumed   = false;
 };
 
 /**
@@ -54,13 +46,13 @@ struct BraceState
  * @retval true   done with this chunk
  * @retval false  keep processing
  */
-static bool close_statement(ParseFrame &frm, Chunk *pc, const BraceState &braceState);
+static bool close_statement(ParsingFrame &frm, Chunk *pc, const BraceState &braceState);
 
 
-static size_t preproc_start(BraceState &braceState, ParseFrame &frm, Chunk *pc);
+static size_t preproc_start(BraceState &braceState, ParsingFrame &frm, Chunk *pc);
 
 
-static void print_stack(log_sev_t logsev, const char *str, const ParseFrame &frm);
+static void print_stack(log_sev_t logsev, const char *str, const ParsingFrame &frm);
 
 
 /**
@@ -74,12 +66,12 @@ static bool maybe_while_of_do(Chunk *pc);
  * @param after  determines: true  - insert_vbrace_close_after(pc, frm)
  *                           false - insert_vbrace_open_before(pc, frm)
  */
-static Chunk *insert_vbrace(Chunk *pc, bool after, const ParseFrame &frm);
+static Chunk *insert_vbrace(Chunk *pc, bool after, const ParsingFrame &frm);
 
 #define insert_vbrace_close_after(pc, frm)    insert_vbrace(pc, true, frm)
 #define insert_vbrace_open_before(pc, frm)    insert_vbrace(pc, false, frm)
 
-static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc);
+static void parse_cleanup(BraceState &braceState, ParsingFrame &frm, Chunk *pc);
 
 
 /**
@@ -95,7 +87,7 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc);
  *
  * @return true - done with this chunk, false - keep processing
  */
-static bool check_complex_statements(ParseFrame &frm, Chunk *pc, const BraceState &braceState);
+static bool check_complex_statements(ParsingFrame &frm, Chunk *pc, const BraceState &braceState);
 
 
 /**
@@ -107,14 +99,14 @@ static bool check_complex_statements(ParseFrame &frm, Chunk *pc, const BraceStat
  *
  * @return true - done with this chunk, false - keep processing
  */
-static bool handle_complex_close(ParseFrame &frm, Chunk *pc, const BraceState &braceState);
+static bool handle_complex_close(ParsingFrame &frm, Chunk *pc, const BraceState &braceState);
 
 
 //! We're on a 'namespace' skip the word and then set the parent of the braces.
 static void mark_namespace(Chunk *pns);
 
 
-static size_t preproc_start(BraceState &braceState, ParseFrame &frm, Chunk *pc)
+static size_t preproc_start(BraceState &braceState, ParsingFrame &frm, Chunk *pc)
 {
    LOG_FUNC_ENTRY();
    const size_t pp_level = braceState.pp_level;
@@ -131,27 +123,27 @@ static size_t preproc_start(BraceState &braceState, ParseFrame &frm, Chunk *pc)
    // If we are not in a define, check for #if, #else, #endif, etc
    if (braceState.in_preproc != CT_PP_DEFINE)
    {
-      int pp_indent = fl_check(braceState.frames, frm, braceState.pp_level, pc);
+      int pp_indent = braceState.frames.check(frm, braceState.pp_level, pc);
       return(pp_indent);
    }
    // else push the frame stack
-   fl_push(braceState.frames, frm);
+   braceState.frames.push(frm);
 
    // a preproc body starts a new, blank frame
-   frm             = {};
-   frm.level       = 1;
-   frm.brace_level = 1;
+   frm = ParsingFrame();
+   frm.SetParenLevel(1);
+   frm.SetBraceLevel(1);
 
    // TODO: not sure about the next 3 lines
-   frm.push(nullptr);
-   frm.top().type = CT_PP_DEFINE;
+   frm.push(Chunk::NullChunkPtr, __func__, __LINE__);
+   frm.top().SetOpenToken(CT_PP_DEFINE);
 
    return(pp_level);
 }
 
 
 static void print_stack(log_sev_t logsev, const char *str,
-                        const ParseFrame &frm)
+                        const ParsingFrame &frm)
 {
    LOG_FUNC_ENTRY();
 
@@ -163,14 +155,14 @@ static void print_stack(log_sev_t logsev, const char *str,
 
    for (size_t idx = 1; idx < frm.size(); idx++)
    {
-      if (frm.at(idx).stage != brace_stage_e::NONE)
+      if (frm.at(idx).GetStage() != E_BraceStage::NONE)
       {
-         LOG_FMT(logsev, " [%s - %u]", get_token_name(frm.at(idx).type),
-                 (unsigned int)frm.at(idx).stage);
+         LOG_FMT(logsev, " [%s - %u]", get_token_name(frm.at(idx).GetOpenToken()),
+                 (unsigned int)frm.at(idx).GetStage());
       }
       else
       {
-         LOG_FMT(logsev, " [%s]", get_token_name(frm.at(idx).type));
+         LOG_FMT(logsev, " [%s]", get_token_name(frm.at(idx).GetOpenToken()));
       }
    }
 
@@ -183,9 +175,9 @@ void brace_cleanup()
 {
    LOG_FUNC_ENTRY();
 
-   BraceState braceState;
-   ParseFrame frm{};
-   Chunk      *pc = Chunk::GetHead();
+   BraceState   braceState;
+   ParsingFrame frm;
+   Chunk        *pc = Chunk::GetHead();
 
    while (pc->IsNotNullChunk())
    {
@@ -198,7 +190,7 @@ void brace_cleanup()
          if (braceState.in_preproc == CT_PP_DEFINE)
          {
             // out of the #define body, restore the frame
-            size_t brace_level = frm.brace_level;
+            size_t brace_level = frm.GetBraceLevel();
 
             if (  options::pp_warn_unbalanced_if()
                && brace_level != 1)
@@ -206,7 +198,7 @@ void brace_cleanup()
                LOG_FMT(LWARN, "%s(%d): orig line is %zu, unbalanced #define block braces, out-level is %zu\n",
                        __func__, __LINE__, pc->GetOrigLine(), brace_level);
             }
-            fl_pop(braceState.frames, frm);
+            braceState.frames.pop(frm);
          }
          braceState.in_preproc = CT_NONE;
       }
@@ -226,12 +218,12 @@ void brace_cleanup()
 
       // Do before assigning stuff from the frame
       if (  language_is_set(LANG_PAWN)
-         && frm.top().type == CT_VBRACE_OPEN
+         && frm.top().GetOpenToken() == CT_VBRACE_OPEN
          && pc->Is(CT_NEWLINE))
       {
          pc = pawn_check_vsemicolon(pc);
 
-         if (pc == nullptr)
+         if (pc->IsNullChunk())
          {
             return;
          }
@@ -243,8 +235,8 @@ void brace_cleanup()
          mark_namespace(pc);
       }
       // Assume the level won't change
-      pc->SetLevel(frm.level);
-      pc->SetBraceLevel(frm.brace_level);
+      pc->SetLevel(frm.GetParenLevel());
+      pc->SetBraceLevel(frm.GetBraceLevel());
       pc->SetPpLevel(pp_level);
 
       /*
@@ -299,7 +291,7 @@ static bool maybe_while_of_do(Chunk *pc)
  * At the heart of this algorithm are two stacks.
  * There is the Paren Stack (PS) and the Frame stack.
  *
- * The PS (pse in the code) keeps track of braces, parens,
+ * The PS (m_parenStack in the code) keeps track of braces, parens,
  * if/else/switch/do/while/etc items -- anything that is nestable.
  * Complex statements go through stages.
  * Take this simple if statement as an example:
@@ -333,7 +325,7 @@ static bool maybe_while_of_do(Chunk *pc)
  * ';'    [ELSE - 0]               <- VBrace close inserted after semicolon
  *                                 <- ELSE removed after statement close
  *
- * The pse stack is kept on a frame stack.
+ * The m_parenStack stack is kept on a frame stack.
  * The frame stack is need for languages that support preprocessors (C, C++, C#)
  * that can arbitrarily change code flow. It also isolates #define macros so
  * that they are indented independently and do not affect the rest of the program.
@@ -349,49 +341,50 @@ static bool maybe_while_of_do(Chunk *pc)
  * When a #define is entered, the current frame is pushed and cleared.
  * When a #define is exited, the frame is popped.
  */
-static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
+static void parse_cleanup(BraceState &braceState, ParsingFrame &frm, Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
    LOG_FMT(LTOK, "%s(%d): orig line is %zu, orig col is %zu, type is %s, tos is %zu, TOS.type is %s, TOS.stage is %s, ",
            __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()),
-           frm.size() - 1, get_token_name(frm.top().type),
-           get_brace_stage_name(frm.top().stage));
+           frm.size() - 1, get_token_name(frm.top().GetOpenToken()),
+           get_brace_stage_name(frm.top().GetStage()));
    log_pcf_flags(LTOK, pc->GetFlags());
 
    // Mark statement starts
    LOG_FMT(LTOK, "%s(%d): orig line is %zu, type is %s, Text() is '%s'\n",
            __func__, __LINE__, pc->GetOrigLine(), get_token_name(pc->GetType()), pc->Text());
-   LOG_FMT(LTOK, "%s(%d): frm.stmt_count is %zu, frm.expr_count is %zu\n",
-           __func__, __LINE__, frm.stmt_count, frm.expr_count);
+   LOG_FMT(LTOK, "%s(%d): frame statement count is %zu, expression count is %zu\n",
+           __func__, __LINE__, frm.GetStmtCount(), frm.GetExprCount());
 
-   if (  (  frm.stmt_count == 0
-         || frm.expr_count == 0)
+   if (  (  frm.GetStmtCount() == 0
+         || frm.GetExprCount() == 0)
       && !pc->IsSemicolon()
       && pc->IsNot(CT_BRACE_CLOSE)
       && pc->IsNot(CT_VBRACE_CLOSE)
       && !pc->IsString(")")
       && !pc->IsString("]"))
    {
-      pc->SetFlagBits(PCF_EXPR_START | ((frm.stmt_count == 0) ? PCF_STMT_START : PCF_NONE));
-      LOG_FMT(LSTMT, "%s(%d): orig line is %zu, 1.marked '%s' as %s, start stmt_count is %zu, expr_count is %zu\n",
+      pc->SetFlagBits(PCF_EXPR_START | ((frm.GetStmtCount() == 0) ? PCF_STMT_START : PCF_NONE));
+      LOG_FMT(LSTMT, "%s(%d): orig line is %zu, 1.marked '%s' as %s, start statement count is %zu, expression count is %zu\n",
               __func__, __LINE__, pc->GetOrigLine(), pc->Text(),
-              pc->TestFlags(PCF_STMT_START) ? "stmt" : "expr", frm.stmt_count,
-              frm.expr_count);
+              pc->TestFlags(PCF_STMT_START) ? "statement" : "expression", frm.GetStmtCount(),
+              frm.GetExprCount());
+      pc->TestFlags(PCF_STMT_START) ? log_ruleStart("start statement", pc) : log_ruleStart("start expression", pc);
    }
-   frm.stmt_count++;
-   frm.expr_count++;
-   LOG_FMT(LTOK, "%s(%d): frm.stmt_count is %zu, frm.expr_count is %zu\n",
-           __func__, __LINE__, frm.stmt_count, frm.expr_count);
+   frm.SetStmtCount(frm.GetStmtCount() + 1);
+   frm.SetExprCount(frm.GetExprCount() + 1);
+   LOG_FMT(LTOK, "%s(%d): frame statement count is %zu, expression count is %zu\n",
+           __func__, __LINE__, frm.GetStmtCount(), frm.GetExprCount());
 
-   if (frm.sparen_count > 0)
+   if (frm.GetSParenCount() > 0)
    {
       pc->SetFlagBits(PCF_IN_SPAREN);
 
       // Mark everything in the for statement
       for (int tmp = static_cast<int>(frm.size()) - 2; tmp >= 0; tmp--)
       {
-         if (frm.at(tmp).type == CT_FOR)
+         if (frm.at(tmp).GetOpenToken() == CT_FOR)
          {
             pc->SetFlagBits(PCF_IN_FOR);
             break;
@@ -401,14 +394,14 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
       // Mark the parent on semicolons in for() statements
       if (  pc->Is(CT_SEMICOLON)
          && frm.size() > 2
-         && frm.prev().type == CT_FOR)
+         && frm.prev().GetOpenToken() == CT_FOR)
       {
          pc->SetParentType(CT_FOR);
       }
    }
 
    // Check the progression of complex statements
-   if (  frm.top().stage != brace_stage_e::NONE
+   if (  frm.top().GetStage() != E_BraceStage::NONE
       && !pc->Is(CT_AUTORELEASEPOOL)
       && check_complex_statements(frm, pc, braceState))
    {
@@ -421,7 +414,7 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
     * The semicolon isn't handled at all.
     * TODO: may need to float VBRACE past comments until newline?
     */
-   if (frm.top().type == CT_VBRACE_OPEN)
+   if (frm.top().GetOpenToken() == CT_VBRACE_OPEN)
    {
       if (pc->IsSemicolon())
       {
@@ -450,21 +443,21 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
    {
       // Change CT_PAREN_CLOSE into CT_SPAREN_CLOSE or CT_FPAREN_CLOSE
       if (  pc->Is(CT_PAREN_CLOSE)
-         && (  (frm.top().type == CT_FPAREN_OPEN)
-            || (frm.top().type == CT_SPAREN_OPEN)))
+         && (  (frm.top().GetOpenToken() == CT_FPAREN_OPEN)
+            || (frm.top().GetOpenToken() == CT_SPAREN_OPEN)))
       {
          // TODO: fix enum hack
-         pc->SetType(static_cast<E_Token>(frm.top().type + 1));
+         pc->SetType(static_cast<E_Token>(frm.top().GetOpenToken() + 1));
 
          if (pc->Is(CT_SPAREN_CLOSE))
          {
-            frm.sparen_count--;
+            frm.SetSParenCount(frm.GetSParenCount() - 1);
             pc->ResetFlagBits(PCF_IN_SPAREN);
          }
       }
 
       // Make sure the open / close match
-      if (pc->IsNot((E_Token)(frm.top().type + 1)))
+      if (pc->IsNot((E_Token)(frm.top().GetOpenToken() + 1)))
       {
          if (pc->TestFlags(PCF_IN_PREPROC))                // Issue #3113, #3283
          {
@@ -474,21 +467,21 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *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->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
-            paren_stack_entry_t AA = frm.top();                // Issue #3055
+            const ParenStackEntry &AA = frm.top();                // Issue #3055
 
-            if (AA.type != CT_EOF)
+            if (AA.GetOpenToken() != CT_EOF)
             {
                LOG_FMT(LWARN, "%s(%d): (frm.top().type + 1) is %s\n",
-                       __func__, __LINE__, get_token_name((E_Token)(frm.top().type + 1)));
+                       __func__, __LINE__, get_token_name((E_Token)(frm.top().GetOpenToken() + 1)));
             }
 
-            if (  frm.top().type != CT_EOF
-               && frm.top().type != CT_PP_DEFINE)
+            if (  frm.top().GetOpenToken() != CT_EOF
+               && frm.top().GetOpenToken() != 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->GetOrigLine(), pc->GetOrigCol(),
-                       pc->Text(), get_token_name(frm.top().pc->GetType()),
-                       frm.top().pc->GetOrigLine());
+                       pc->Text(), get_token_name(frm.top().GetOpenChunk()->GetType()),
+                       frm.top().GetOpenChunk()->GetOrigLine());
                print_stack(LBCSPOP, "=Error  ", frm);
                exit(EXIT_FAILURE);
             }
@@ -499,20 +492,20 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
          braceState.consumed = true;
 
          // Copy the parent, update the parenthesis/brace levels
-         pc->SetParentType(frm.top().parent);
-         frm.level--;
+         pc->SetParentType(frm.top().GetParent());
+         frm.SetParenLevel(frm.GetParenLevel() - 1);
 
          if (  pc->Is(CT_BRACE_CLOSE)
             || pc->Is(CT_VBRACE_CLOSE)
             || pc->Is(CT_MACRO_CLOSE))
          {
-            frm.brace_level--;
-            LOG_FMT(LBCSPOP, "%s(%d): frm.brace_level decreased to %zu",
-                    __func__, __LINE__, frm.brace_level);
+            frm.SetBraceLevel(frm.GetBraceLevel() - 1);
+            LOG_FMT(LBCSPOP, "%s(%d): frame brace level decreased to %zu",
+                    __func__, __LINE__, frm.GetBraceLevel());
             log_pcf_flags(LBCSPOP, pc->GetFlags());
          }
-         pc->SetLevel(frm.level);
-         pc->SetBraceLevel(frm.brace_level);
+         pc->SetLevel(frm.GetParenLevel());
+         pc->SetBraceLevel(frm.GetBraceLevel());
 
          // Pop the entry
          LOG_FMT(LBCSPOP, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
@@ -520,21 +513,21 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
          frm.pop(__func__, __LINE__, pc);
          print_stack(LBCSPOP, "-Close  ", frm);
 
-         if (  frm.top().stage == brace_stage_e::NONE
+         if (  frm.top().GetStage() == E_BraceStage::NONE
             && (  pc->Is(CT_VBRACE_CLOSE)
                || pc->Is(CT_BRACE_CLOSE)
                || pc->Is(CT_SEMICOLON))
-            && frm.top().pc->Is(CT_VBRACE_OPEN))
+            && frm.top().GetOpenChunk()->Is(CT_VBRACE_OPEN))
          {
             // frames for functions are not created as they are for an if
             // this here is a hackish solution to close a vbrace of a block that
             // contains the function
-            frm.push(nullptr); // <- dummy frame for the function
-            frm.top().stage = brace_stage_e::BRACE2;
+            frm.push(Chunk::NullChunkPtr, __func__, __LINE__);                                     // <- dummy frame for the function
+            frm.top().SetStage(E_BraceStage::BRACE2);
          }
 
          // See if we are in a complex statement
-         if (frm.top().stage != brace_stage_e::NONE)
+         if (frm.top().GetStage() != E_BraceStage::NONE)
          {
             handle_complex_close(frm, pc, braceState);
          }
@@ -546,7 +539,7 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
     * sparen, so we need to check braceState.consumed to see if the close sparen
     * was already handled.
     */
-   if (frm.top().stage == brace_stage_e::WOD_SEMI)
+   if (frm.top().GetStage() == E_BraceStage::WOD_SEMI)
    {
       if (braceState.consumed)
       {
@@ -616,8 +609,8 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
                || prev->Is(CT_D_SCOPE_IF))
             {
                pc->SetType(CT_SPAREN_OPEN);
-               parentType = frm.top().type;
-               frm.sparen_count++;
+               parentType = frm.top().GetOpenToken();
+               frm.SetSParenCount(frm.GetSParenCount() + 1);
             }
             else if (prev->Is(CT_FUNCTION))
             {
@@ -641,9 +634,9 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
          else  // must be CT_BRACE_OPEN
          {
             // Set the parent for open braces
-            if (frm.top().stage != brace_stage_e::NONE)
+            if (frm.top().GetStage() != E_BraceStage::NONE)
             {
-               parentType = frm.top().type;
+               parentType = frm.top().GetOpenToken();
             }
             else if (  prev->Is(CT_ASSIGN)
                     && (prev->GetStr()[0] == '='))
@@ -684,7 +677,7 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
       || pc->Is(CT_MACRO_OPEN)
       || pc->Is(CT_SQUARE_OPEN))
    {
-      frm.level++;
+      frm.SetParenLevel(frm.GetParenLevel() + 1);
 
       if (  pc->Is(CT_BRACE_OPEN)
          || pc->Is(CT_MACRO_OPEN))
@@ -696,10 +689,9 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
          {
             LOG_FMT(LBCSPOP, "%s(%d): parent type is NAMESPACE\n",
                     __func__, __LINE__);
-            Chunk *tmp = frm.top().pc;
+            Chunk *tmp = frm.top().GetOpenChunk();
 
-            if (  tmp != nullptr
-               && tmp->GetParentType() == CT_NAMESPACE)
+            if (tmp->GetParentType() == CT_NAMESPACE)
             {
                LOG_FMT(LBCSPOP, "%s(%d): tmp->GetParentType() is NAMESPACE\n",
                        __func__, __LINE__);
@@ -721,13 +713,13 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
 
          if (!single)
          {
-            frm.brace_level++;
-            LOG_FMT(LBCSPOP, "%s(%d): frm.brace_level increased to %zu\n",
-                    __func__, __LINE__, frm.brace_level);
+            frm.SetBraceLevel(frm.GetBraceLevel() + 1);
+            LOG_FMT(LBCSPOP, "%s(%d): frame brace level increased to %zu\n",
+                    __func__, __LINE__, frm.GetBraceLevel());
          }
       }
       frm.push(pc, __func__, __LINE__);
-      frm.top().parent = parentType;
+      frm.top().SetParent(parentType);
       pc->SetParentType(parentType);
    }
    // Issue #2281
@@ -738,9 +730,9 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
       size_t idx = frm.size();
       LOG_FMT(LBCSPOP, "%s(%d): idx is %zu\n",
               __func__, __LINE__, idx);
-      Chunk *saved = frm.at(idx - 2).pc;
+      Chunk *saved = frm.at(idx - 2).GetOpenChunk();
 
-      if (saved != nullptr)
+      if (saved->IsNotNullChunk())
       {
          // set parent member
          pc->SetParent(saved);
@@ -763,9 +755,9 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
          size_t idx = frm.size();
          LOG_FMT(LBCSPOP, "%s(%d): idx is %zu\n",
                  __func__, __LINE__, idx);
-         Chunk *saved = frm.at(idx - 2).pc;
+         Chunk *saved = frm.at(idx - 2).GetOpenChunk();
 
-         if (saved != nullptr)
+         if (saved->IsNotNullChunk())
          {
             // set parent member
             pc->SetParent(saved);
@@ -780,9 +772,9 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
       size_t idx = frm.size();
       LOG_FMT(LBCSPOP, "%s(%d): idx is %zu\n",
               __func__, __LINE__, idx);
-      Chunk *saved = frm.at(idx - 2).pc;
+      Chunk *saved = frm.at(idx - 2).GetOpenChunk();
 
-      if (saved != nullptr)
+      if (saved->IsNotNullChunk())
       {
          // set parent member
          pc->SetParent(saved);
@@ -797,31 +789,31 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
     */
    if (patcls == pattern_class_e::BRACED)
    {
-      frm.push(pc, __func__, __LINE__, (pc->Is(CT_DO) ? brace_stage_e::BRACE_DO
-                    : brace_stage_e::BRACE2));
+      frm.push(pc, __func__, __LINE__, (pc->Is(CT_DO) ? E_BraceStage::BRACE_DO
+                    : E_BraceStage::BRACE2));
       // "+ComplexBraced"
    }
    else if (patcls == pattern_class_e::PBRACED)
    {
-      brace_stage_e bs = brace_stage_e::PAREN1;
+      E_BraceStage bs = E_BraceStage::PAREN1;
 
       if (  pc->Is(CT_WHILE)
          && maybe_while_of_do(pc))
       {
          pc->SetType(CT_WHILE_OF_DO);
-         bs = brace_stage_e::WOD_PAREN;
+         bs = E_BraceStage::WOD_PAREN;
       }
       frm.push(pc, __func__, __LINE__, bs);
       // "+ComplexParenBraced"
    }
    else if (patcls == pattern_class_e::OPBRACED)
    {
-      frm.push(pc, __func__, __LINE__, brace_stage_e::OP_PAREN1);
+      frm.push(pc, __func__, __LINE__, E_BraceStage::OP_PAREN1);
       // "+ComplexOpParenBraced");
    }
    else if (patcls == pattern_class_e::ELSE)
    {
-      frm.push(pc, __func__, __LINE__, brace_stage_e::ELSEIF);
+      frm.push(pc, __func__, __LINE__, E_BraceStage::ELSEIF);
       // "+ComplexElse");
    }
 
@@ -841,17 +833,17 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
       || pc->Is(CT_COLON)
       || pc->Is(CT_OC_END)
       || (  pc->IsSemicolon()
-         && frm.top().type != CT_PAREN_OPEN
-         && frm.top().type != CT_FPAREN_OPEN
-         && frm.top().type != CT_SPAREN_OPEN)
+         && frm.top().GetOpenToken() != CT_PAREN_OPEN
+         && frm.top().GetOpenToken() != CT_FPAREN_OPEN
+         && frm.top().GetOpenToken() != CT_SPAREN_OPEN)
       || pc->Is(CT_MACRO))                         // Issue #2742
    {
       LOG_FMT(LSTMT, "%s(%d): orig line is %zu, reset1 stmt on '%s'\n",
               __func__, __LINE__, pc->GetOrigLine(), pc->Text());
-      frm.stmt_count = 0;
-      frm.expr_count = 0;
-      LOG_FMT(LTOK, "%s(%d): frm.stmt_count is %zu, frm.expr_count is %zu\n",
-              __func__, __LINE__, frm.stmt_count, frm.expr_count);
+      frm.SetStmtCount(0);
+      frm.SetExprCount(0);
+      LOG_FMT(LTOK, "%s(%d): frame statement count is %zu, expression count is %zu\n",
+              __func__, __LINE__, frm.GetStmtCount(), frm.GetExprCount());
    }
    // Mark expression starts
    LOG_FMT(LSTMT, "%s(%d): Mark expression starts: orig line is %zu, orig col is %zu, Text() is '%s'\n",
@@ -886,40 +878,40 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
       || pc->Is(CT_COLON)
       || pc->Is(CT_QUESTION))
    {
-      frm.expr_count = 0;
+      frm.SetExprCount(0);
       LOG_FMT(LSTMT, "%s(%d): orig line is %zu, orig col is %zu, reset expr on '%s'\n",
               __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
    }
 } // parse_cleanup
 
 
-static bool check_complex_statements(ParseFrame &frm, Chunk *pc, const BraceState &braceState)
+static bool check_complex_statements(ParsingFrame &frm, Chunk *pc, const BraceState &braceState)
 {
    LOG_FUNC_ENTRY();
 
-   brace_stage_e atest = frm.top().stage;
+   E_BraceStage atest = frm.top().GetStage();
 
    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)
+   if (frm.top().GetStage() == E_BraceStage::OP_PAREN1)
    {
-      frm.top().stage = (pc->IsNot(CT_PAREN_OPEN))
-                        ? brace_stage_e::BRACE2
-                        : brace_stage_e::PAREN1;
+      frm.top().SetStage(pc->IsNot(CT_PAREN_OPEN)
+                        ? E_BraceStage::BRACE2
+                        : E_BraceStage::PAREN1);
       LOG_FMT(LBCSPOP, "%s(%d): frm.top().stage is now %s\n",
-              __func__, __LINE__, get_brace_stage_name(frm.top().stage));
+              __func__, __LINE__, get_brace_stage_name(frm.top().GetStage()));
    }
 
    // Check for CT_ELSE after CT_IF
-   while (frm.top().stage == brace_stage_e::ELSE)
+   while (frm.top().GetStage() == E_BraceStage::ELSE)
    {
       if (pc->Is(CT_ELSE))
       {
          // Replace CT_IF with CT_ELSE on the stack & we are done
-         frm.top().type  = CT_ELSE;
-         frm.top().stage = brace_stage_e::ELSEIF;
+         frm.top().SetOpenToken(CT_ELSE);
+         frm.top().SetStage(E_BraceStage::ELSEIF);
          print_stack(LBCSSWAP, "=Swap   ", frm);
 
          return(true);
@@ -937,7 +929,7 @@ static bool check_complex_statements(ParseFrame &frm, Chunk *pc, const BraceStat
    }
 
    // Check for CT_IF after CT_ELSE
-   if (frm.top().stage == brace_stage_e::ELSEIF)
+   if (frm.top().GetStage() == E_BraceStage::ELSEIF)
    {
       log_rule_B("indent_else_if");
 
@@ -947,33 +939,33 @@ static bool check_complex_statements(ParseFrame &frm, Chunk *pc, const BraceStat
       {
          // Replace CT_ELSE with CT_IF
          pc->SetType(CT_ELSEIF);
-         frm.top().type  = CT_ELSEIF;
-         frm.top().stage = brace_stage_e::PAREN1;
+         frm.top().SetOpenToken(CT_ELSEIF);
+         frm.top().SetStage(E_BraceStage::PAREN1);
          return(true);
       }
       // Jump to the 'expecting brace' stage
-      frm.top().stage = brace_stage_e::BRACE2;
+      frm.top().SetStage(E_BraceStage::BRACE2);
    }
 
    // Check for CT_CATCH or CT_FINALLY after CT_TRY or CT_CATCH
-   while (frm.top().stage == brace_stage_e::CATCH)
+   while (frm.top().GetStage() == E_BraceStage::CATCH)
    {
       if (  pc->Is(CT_CATCH)
          || pc->Is(CT_FINALLY))
       {
          // Replace CT_TRY with CT_CATCH or CT_FINALLY on the stack & we are done
-         frm.top().type = pc->GetType();
+         frm.top().SetOpenToken(pc->GetType());
 
          if (language_is_set(LANG_CS))
          {
-            frm.top().stage = (pc->Is(CT_CATCH)) ? brace_stage_e::CATCH_WHEN : brace_stage_e::BRACE2;
+            frm.top().SetStage((pc->Is(CT_CATCH)) ? E_BraceStage::CATCH_WHEN : E_BraceStage::BRACE2);
          }
          else
          {
             // historically this used OP_PAREN1; however, to my knowledge the expression after a catch clause
             // is only optional for C# which has been handled above; therefore, this should now always expect
             // a parenthetical expression after the catch keyword and brace after the finally keyword
-            frm.top().stage = (pc->Is(CT_CATCH)) ? brace_stage_e::PAREN1 : brace_stage_e::BRACE2;
+            frm.top().SetStage((pc->Is(CT_CATCH)) ? E_BraceStage::PAREN1 : E_BraceStage::BRACE2);
          }
          print_stack(LBCSSWAP, "=Swap   ", frm);
 
@@ -992,42 +984,42 @@ static bool check_complex_statements(ParseFrame &frm, Chunk *pc, const BraceStat
    }
 
    // Check for optional parenthesis and optional CT_WHEN after CT_CATCH
-   if (frm.top().stage == brace_stage_e::CATCH_WHEN)
+   if (frm.top().GetStage() == E_BraceStage::CATCH_WHEN)
    {
       if (pc->Is(CT_PAREN_OPEN)) // this is for the paren after "catch"
       {
          // Replace CT_PAREN_OPEN with CT_SPAREN_OPEN
          pc->SetType(CT_SPAREN_OPEN);
-         frm.top().type  = pc->GetType();
-         frm.top().stage = brace_stage_e::PAREN1;
+         frm.top().SetOpenToken(pc->GetType());
+         frm.top().SetStage(E_BraceStage::PAREN1);
 
          return(false);
       }
 
       if (pc->Is(CT_WHEN))
       {
-         frm.top().type  = pc->GetType();
-         frm.top().stage = brace_stage_e::OP_PAREN1;
+         frm.top().SetOpenToken(pc->GetType());
+         frm.top().SetStage(E_BraceStage::OP_PAREN1);
 
          return(true);
       }
 
       if (pc->Is(CT_BRACE_OPEN))
       {
-         frm.top().stage = brace_stage_e::BRACE2;
+         frm.top().SetStage(E_BraceStage::BRACE2);
 
          return(false);
       }
    }
 
    // Check for CT_WHILE after the CT_DO
-   if (frm.top().stage == brace_stage_e::WHILE)
+   if (frm.top().GetStage() == E_BraceStage::WHILE)
    {
       if (pc->Is(CT_WHILE))
       {
          pc->SetType(CT_WHILE_OF_DO);
-         frm.top().type  = CT_WHILE_OF_DO; //CT_WHILE;
-         frm.top().stage = brace_stage_e::WOD_PAREN;
+         frm.top().SetOpenToken(CT_WHILE_OF_DO);
+         frm.top().SetStage(E_BraceStage::WOD_PAREN);
 
          return(true);
       }
@@ -1042,12 +1034,12 @@ static bool check_complex_statements(ParseFrame &frm, Chunk *pc, const BraceStat
    }
    // Insert a CT_VBRACE_OPEN, if needed
    // but not in a preprocessor
-   atest = frm.top().stage;
+   atest = frm.top().GetStage();
 
    if (  pc->IsNot(CT_BRACE_OPEN)
       && !pc->TestFlags(PCF_IN_PREPROC)
-      && (  (frm.top().stage == brace_stage_e::BRACE2)
-         || (frm.top().stage == brace_stage_e::BRACE_DO)))
+      && (  (frm.top().GetStage() == E_BraceStage::BRACE2)
+         || (frm.top().GetStage() == E_BraceStage::BRACE_DO)))
    {
       log_rule_B("indent_using_block");
 
@@ -1059,43 +1051,43 @@ static bool check_complex_statements(ParseFrame &frm, Chunk *pc, const BraceStat
       }
       else
       {
-         const E_Token parentType = frm.top().type;
+         const E_Token parentType = frm.top().GetOpenToken();
 
          Chunk         *vbrace = insert_vbrace_open_before(pc, frm);
          vbrace->SetParentType(parentType);
 
-         frm.level++;
-         frm.brace_level++;
-         LOG_FMT(LBCSPOP, "%s(%d): frm.brace_level increased to %zu\n",
-                 __func__, __LINE__, frm.brace_level);
+         frm.SetParenLevel(frm.GetParenLevel() + 1);
+         frm.SetBraceLevel(frm.GetBraceLevel() + 1);
+         LOG_FMT(LBCSPOP, "%s(%d): frame brace level increased to %zu\n",
+                 __func__, __LINE__, frm.GetBraceLevel());
          log_pcf_flags(LBCSPOP, pc->GetFlags());
 
-         frm.push(vbrace, __func__, __LINE__, brace_stage_e::NONE);
+         frm.push(vbrace, __func__, __LINE__, E_BraceStage::NONE);
          // "+VBrace");
 
-         frm.top().parent = parentType;
+         frm.top().SetParent(parentType);
 
          // update the level of pc
-         pc->SetLevel(frm.level);
-         pc->SetBraceLevel(frm.brace_level);
+         pc->SetLevel(frm.GetParenLevel());
+         pc->SetBraceLevel(frm.GetBraceLevel());
 
          // Mark as a start of a statement
-         frm.stmt_count = 0;
-         frm.expr_count = 0;
-         LOG_FMT(LTOK, "%s(%d): frm.stmt_count is %zu, frm.expr_count is %zu\n",
-                 __func__, __LINE__, frm.stmt_count, frm.expr_count);
+         frm.SetStmtCount(0);
+         frm.SetExprCount(0);
+         LOG_FMT(LTOK, "%s(%d): frame statement count is %zu, expression count is %zu\n",
+                 __func__, __LINE__, frm.GetStmtCount(), frm.GetExprCount());
          pc->SetFlagBits(PCF_STMT_START | PCF_EXPR_START);
-         frm.stmt_count = 1;
-         frm.expr_count = 1;
+         frm.SetStmtCount(1);
+         frm.SetExprCount(1);
          LOG_FMT(LSTMT, "%s(%d): orig line is %zu, 2.marked '%s' as stmt start\n",
                  __func__, __LINE__, pc->GetOrigLine(), pc->Text());
       }
    }
 
    // Check for "constexpr" after CT_IF or CT_ELSEIF
-   if (  frm.top().stage == brace_stage_e::PAREN1
-      && (  frm.top().type == CT_IF
-         || frm.top().type == CT_ELSEIF)
+   if (  frm.top().GetStage() == E_BraceStage::PAREN1
+      && (  frm.top().GetOpenToken() == CT_IF
+         || frm.top().GetOpenToken() == CT_ELSEIF)
       && pc->Is(CT_CONSTEXPR))
    {
       return(false);
@@ -1103,12 +1095,12 @@ static bool check_complex_statements(ParseFrame &frm, Chunk *pc, const BraceStat
 
    // Verify open parenthesis in complex statement
    if (  pc->IsNot(CT_PAREN_OPEN)
-      && (  (frm.top().stage == brace_stage_e::PAREN1)
-         || (frm.top().stage == brace_stage_e::WOD_PAREN)))
+      && (  (frm.top().GetStage() == E_BraceStage::PAREN1)
+         || (frm.top().GetStage() == E_BraceStage::WOD_PAREN)))
    {
       LOG_FMT(LWARN, "%s(%d): %s, orig line is %zu, Error: Expected '(', got '%s' for '%s'\n",
               __func__, __LINE__, cpd.filename.c_str(), pc->GetOrigLine(), pc->Text(),
-              get_token_name(frm.top().type));
+              get_token_name(frm.top().GetOpenToken()));
 
       // Throw out the complex statement
       LOG_FMT(LBCSPOP, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
@@ -1121,29 +1113,29 @@ static bool check_complex_statements(ParseFrame &frm, Chunk *pc, const BraceStat
 } // check_complex_statements
 
 
-static bool handle_complex_close(ParseFrame &frm, Chunk *pc, const BraceState &braceState)
+static bool handle_complex_close(ParsingFrame &frm, Chunk *pc, const BraceState &braceState)
 {
    LOG_FUNC_ENTRY();
 
-   if (frm.top().stage == brace_stage_e::PAREN1)
+   if (frm.top().GetStage() == E_BraceStage::PAREN1)
    {
       if (pc->GetNext()->GetType() == CT_WHEN)
       {
-         frm.top().type  = pc->GetType();
-         frm.top().stage = brace_stage_e::CATCH_WHEN;
+         frm.top().SetOpenToken(pc->GetType());
+         frm.top().SetStage(E_BraceStage::CATCH_WHEN);
 
          return(true);
       }
       // PAREN1 always => BRACE2
-      frm.top().stage = brace_stage_e::BRACE2;
+      frm.top().SetStage(E_BraceStage::BRACE2);
    }
-   else if (frm.top().stage == brace_stage_e::BRACE2)
+   else if (frm.top().GetStage() == E_BraceStage::BRACE2)
    {
       // BRACE2: IF => ELSE, anything else => close
-      if (  (frm.top().type == CT_IF)
-         || (frm.top().type == CT_ELSEIF))
+      if (  (frm.top().GetOpenToken() == CT_IF)
+         || (frm.top().GetOpenToken() == CT_ELSEIF))
       {
-         frm.top().stage = brace_stage_e::ELSE;
+         frm.top().SetStage(E_BraceStage::ELSE);
 
          // If the next chunk isn't CT_ELSE, close the statement
          Chunk *next = pc->GetNextNcNnl();
@@ -1159,10 +1151,10 @@ static bool handle_complex_close(ParseFrame &frm, Chunk *pc, const BraceState &b
             return(close_statement(frm, pc, braceState));
          }
       }
-      else if (  (frm.top().type == CT_TRY)
-              || (frm.top().type == CT_CATCH))
+      else if (  (frm.top().GetOpenToken() == CT_TRY)
+              || (frm.top().GetOpenToken() == CT_CATCH))
       {
-         frm.top().stage = brace_stage_e::CATCH;
+         frm.top().SetStage(E_BraceStage::CATCH);
 
          // If the next chunk isn't CT_CATCH or CT_FINALLY, close the statement
          Chunk *next = pc->GetNextNcNnl();
@@ -1180,8 +1172,8 @@ static bool handle_complex_close(ParseFrame &frm, Chunk *pc, const BraceState &b
       }
       else
       {
-         LOG_FMT(LNOTE, "%s(%d): close_statement on %s brace_stage_e::BRACE2\n",
-                 __func__, __LINE__, get_token_name(frm.top().type));
+         LOG_FMT(LNOTE, "%s(%d): close_statement on %s E_BraceStage::BRACE2\n",
+                 __func__, __LINE__, get_token_name(frm.top().GetOpenToken()));
          LOG_FMT(LBCSPOP, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
                  __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
          frm.pop(__func__, __LINE__, pc);
@@ -1190,21 +1182,21 @@ static bool handle_complex_close(ParseFrame &frm, Chunk *pc, const BraceState &b
          return(close_statement(frm, pc, braceState));
       }
    }
-   else if (frm.top().stage == brace_stage_e::BRACE_DO)
+   else if (frm.top().GetStage() == E_BraceStage::BRACE_DO)
    {
-      frm.top().stage = brace_stage_e::WHILE;
+      frm.top().SetStage(E_BraceStage::WHILE);
    }
-   else if (frm.top().stage == brace_stage_e::WOD_PAREN)
+   else if (frm.top().GetStage() == E_BraceStage::WOD_PAREN)
    {
-      LOG_FMT(LNOTE, "%s(%d): close_statement on %s brace_stage_e::WOD_PAREN\n",
-              __func__, __LINE__, get_token_name(frm.top().type));
-      frm.top().stage = brace_stage_e::WOD_SEMI;
+      LOG_FMT(LNOTE, "%s(%d): close_statement on %s E_BraceStage::WOD_PAREN\n",
+              __func__, __LINE__, get_token_name(frm.top().GetOpenToken()));
+      frm.top().SetStage(E_BraceStage::WOD_SEMI);
       print_stack(LBCSPOP, "-HCC WoDP ", frm);
    }
-   else if (frm.top().stage == brace_stage_e::WOD_SEMI)
+   else if (frm.top().GetStage() == E_BraceStage::WOD_SEMI)
    {
-      LOG_FMT(LNOTE, "%s(%d): close_statement on %s brace_stage_e::WOD_SEMI\n",
-              __func__, __LINE__, get_token_name(frm.top().type));
+      LOG_FMT(LNOTE, "%s(%d): close_statement on %s E_BraceStage::WOD_SEMI\n",
+              __func__, __LINE__, get_token_name(frm.top().GetOpenToken()));
       LOG_FMT(LBCSPOP, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
               __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
       frm.pop(__func__, __LINE__, pc);
@@ -1217,8 +1209,8 @@ static bool handle_complex_close(ParseFrame &frm, Chunk *pc, const BraceState &b
       // PROBLEM
       LOG_FMT(LWARN, "%s(%d): %s:%zu Error: TOS.type='%s' TOS.stage=%u\n",
               __func__, __LINE__, cpd.filename.c_str(), pc->GetOrigLine(),
-              get_token_name(frm.top().type),
-              (unsigned int)frm.top().stage);
+              get_token_name(frm.top().GetOpenToken()),
+              (unsigned int)frm.top().GetStage());
       exit(EX_SOFTWARE);
    }
    return(false);
@@ -1285,17 +1277,17 @@ static void mark_namespace(Chunk *pns)
 } // mark_namespace
 
 
-static Chunk *insert_vbrace(Chunk *pc, bool after, const ParseFrame &frm)
+static Chunk *insert_vbrace(Chunk *pc, bool after, const ParsingFrame &frm)
 {
    LOG_FUNC_ENTRY();
 
    Chunk chunk;
 
-   chunk.SetParentType(frm.top().type);
+   chunk.SetParentType(frm.top().GetOpenToken());
    chunk.SetOrigLine(pc->GetOrigLine());
-   chunk.SetLevel(frm.level);
-   chunk.SetPpLevel(frm.pp_level);
-   chunk.SetBraceLevel(frm.brace_level);
+   chunk.SetLevel(frm.GetParenLevel());
+   chunk.SetPpLevel(frm.GetPpLevel());
+   chunk.SetBraceLevel(frm.GetBraceLevel());
    chunk.SetFlags(pc->GetFlags() & PCF_COPY_FLAGS);
    chunk.Str() = "";
 
@@ -1309,7 +1301,7 @@ static Chunk *insert_vbrace(Chunk *pc, bool after, const ParseFrame &frm)
 
    if (ref->IsNullChunk())
    {
-      return(nullptr);
+      return(Chunk::NullChunkPtr);
    }
 
    if (!ref->TestFlags(PCF_IN_PREPROC))
@@ -1327,7 +1319,7 @@ static Chunk *insert_vbrace(Chunk *pc, bool after, const ParseFrame &frm)
 
    if (ref->IsNullChunk())
    {
-      return(nullptr);
+      return(Chunk::NullChunkPtr);
    }
 
    // Don't back into a preprocessor
@@ -1360,7 +1352,7 @@ static Chunk *insert_vbrace(Chunk *pc, bool after, const ParseFrame &frm)
 
    if (ref->IsNullChunk())
    {
-      return(nullptr);
+      return(Chunk::NullChunkPtr);
    }
    chunk.SetOrigLine(ref->GetOrigLine());
    chunk.SetOrigCol(ref->GetOrigCol());
@@ -1372,26 +1364,25 @@ static Chunk *insert_vbrace(Chunk *pc, bool after, const ParseFrame &frm)
 } // insert_vbrace
 
 
-bool close_statement(ParseFrame &frm, Chunk *pc, const BraceState &braceState)
+bool close_statement(ParsingFrame &frm, Chunk *pc, const BraceState &braceState)
 {
    LOG_FUNC_ENTRY();
 
-   if (  pc == nullptr
-      || pc->IsNullChunk())
+   if (pc->IsNullChunk())
    {
       throw invalid_argument(string(__func__) + ":" + to_string(__LINE__)
-                             + "args cannot be nullptr");
+                             + "args cannot be null chunk");
    }
    LOG_FMT(LTOK, "%s(%d): orig line is %zu, type is %s, '%s' type is %s, stage is %u\n",
            __func__, __LINE__, pc->GetOrigLine(),
            get_token_name(pc->GetType()), pc->Text(),
-           get_token_name(frm.top().type),
-           (unsigned int)frm.top().stage);
+           get_token_name(frm.top().GetOpenToken()),
+           (unsigned int)frm.top().GetStage());
 
    if (braceState.consumed)
    {
-      frm.stmt_count = 0;
-      frm.expr_count = 0;
+      frm.SetStmtCount(0);
+      frm.SetExprCount(0);
       LOG_FMT(LSTMT, "%s(%d): orig line is %zu> reset2 stmt on '%s'\n",
               __func__, __LINE__, pc->GetOrigLine(), pc->Text());
    }
@@ -1401,7 +1392,7 @@ bool close_statement(ParseFrame &frm, Chunk *pc, const BraceState &braceState)
     */
    Chunk *vbc = pc;
 
-   if (frm.top().type == CT_VBRACE_OPEN)
+   if (frm.top().GetOpenToken() == CT_VBRACE_OPEN)
    {
       // If the current token has already been consumed, then add after it
       if (braceState.consumed)
@@ -1413,21 +1404,21 @@ bool close_statement(ParseFrame &frm, Chunk *pc, const BraceState &braceState)
          // otherwise, add before it and consume the vbrace
          vbc = pc->GetPrevNcNnl();
 
-         frm.level--;
-         frm.brace_level--;
+         frm.SetParenLevel(frm.GetParenLevel() - 1);
+         frm.SetBraceLevel(frm.GetBraceLevel() - 1);
          vbc = insert_vbrace_close_after(vbc, frm);
-         vbc->SetParentType(frm.top().parent);
+         vbc->SetParentType(frm.top().GetParent());
 
-         LOG_FMT(LBCSPOP, "%s(%d): frm.brace_level decreased to %zu\n",
-                 __func__, __LINE__, frm.brace_level);
+         LOG_FMT(LBCSPOP, "%s(%d): frame brace level decreased to %zu\n",
+                 __func__, __LINE__, frm.GetBraceLevel());
          log_pcf_flags(LBCSPOP, pc->GetFlags());
          LOG_FMT(LBCSPOP, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
                  __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
          frm.pop(__func__, __LINE__, pc);
 
          // Update the token level
-         pc->SetLevel(frm.level);
-         pc->SetBraceLevel(frm.brace_level);
+         pc->SetLevel(frm.GetParenLevel());
+         pc->SetBraceLevel(frm.GetBraceLevel());
 
          print_stack(LBCSPOP, "-CS VB  ", frm);
 
@@ -1438,7 +1429,7 @@ bool close_statement(ParseFrame &frm, Chunk *pc, const BraceState &braceState)
    }
 
    // See if we are done with a complex statement
-   if (frm.top().stage != brace_stage_e::NONE)
+   if (frm.top().GetStage() != E_BraceStage::NONE)
    {
       if (handle_complex_close(frm, vbc, braceState))
       {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/brace_cleanup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/brace_cleanup.h
index e281d2e3..10bc482a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/brace_cleanup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/brace_cleanup.h
@@ -11,7 +11,7 @@
 
 #include "uncrustify_types.h"
 // necessary to not sort
-#include "ParseFrame.h"
+#include "parsing_frame.h"
 
 /**
  * Scans through the whole list and does stuff.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/braces.cpp
index 1737e79e..c4b4b666 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/braces.cpp
@@ -77,7 +77,7 @@ static bool should_add_braces(Chunk *vbopen);
  * Collect the text into txt that contains the full tag name.
  * Mainly for collecting namespace 'a.b.c' or function 'foo::bar()' names.
  */
-static void append_tag_name(unc_text &txt, Chunk *pc);
+static void append_tag_name(UncText &txt, Chunk *pc);
 
 
 //! Remove the case brace, if allowable.
@@ -102,8 +102,7 @@ static void process_if_chain(Chunk *br_start);
  *
  * @param brace  the brace chunk whose predecessing parenthesis will be checked
  *
- * @pre   the brace chunk cannot be a nullptr,
- *        it needs to be of type CT_BRACE_OPEN or CT_BRACE_CLOSE,
+ * @pre   it needs to be of type CT_BRACE_OPEN or CT_BRACE_CLOSE,
  *        its parent type needs to be one of this types:
  *            CT_IF, CT_ELSEIF, CT_FOR, CT_USING_STMT, CT_WHILE,
  *            CT_FUNC_CLASS_DEF, CT_FUNC_DEF
@@ -115,8 +114,7 @@ static void process_if_chain(Chunk *br_start);
  */
 static bool paren_multiline_before_brace(Chunk *brace)
 {
-   if (  brace == nullptr
-      || (  brace->IsNot(CT_BRACE_OPEN)
+   if (  (  brace->IsNot(CT_BRACE_OPEN)
          && brace->IsNot(CT_BRACE_CLOSE))
       || (  brace->GetParentType() != CT_IF
          && brace->GetParentType() != CT_ELSEIF
@@ -673,7 +671,7 @@ static void examine_brace(Chunk *bopen)
 
    if (pc->IsNullChunk())
    {
-      LOG_FMT(LBRDEL, "%s(%d): pc is nullptr\n", __func__, __LINE__);
+      LOG_FMT(LBRDEL, "%s(%d): pc is a null chunk\n", __func__, __LINE__);
       return;
    }
    LOG_FMT(LBRDEL, "%s(%d):  - end on '%s' on line %zu. if_count is %zu, semi_count is %zu\n",
@@ -761,8 +759,7 @@ static void convert_brace(Chunk *br)
 {
    LOG_FUNC_ENTRY();
 
-   if (  br == nullptr
-      || br->TestFlags(PCF_KEEP_BRACE))
+   if (br->TestFlags(PCF_KEEP_BRACE))
    {
       return;
    }
@@ -844,11 +841,6 @@ static void convert_vbrace(Chunk *vbr)
 {
    LOG_FUNC_ENTRY();
 
-   if (vbr == nullptr)
-   {
-      return;
-   }
-
    if (vbr->Is(CT_VBRACE_OPEN))
    {
       vbr->SetType(CT_BRACE_OPEN);
@@ -969,7 +961,7 @@ static void convert_vbrace_to_brace()
 
 
 Chunk *insert_comment_after(Chunk *ref, E_Token cmt_type,
-                            const unc_text &cmt_text)
+                            const UncText &cmt_text)
 {
    LOG_FUNC_ENTRY();
 
@@ -1003,7 +995,7 @@ Chunk *insert_comment_after(Chunk *ref, E_Token cmt_type,
 }
 
 
-static void append_tag_name(unc_text &txt, Chunk *pc)
+static void append_tag_name(UncText &txt, Chunk *pc)
 {
    LOG_FUNC_ENTRY();
    Chunk *tmp = pc->GetPrevNcNnl();
@@ -1129,9 +1121,9 @@ void add_long_closebrace_comment()
          {
             break;
          }
-         size_t   nl_min  = 0;
-         Chunk    *tag_pc = Chunk::NullChunkPtr;
-         unc_text xstr;
+         size_t  nl_min  = 0;
+         Chunk   *tag_pc = Chunk::NullChunkPtr;
+         UncText xstr;
 
          if (  br_open->GetParentType() == CT_FUNC_DEF
             || br_open->GetParentType() == CT_OC_MSG_DECL)
@@ -1148,7 +1140,7 @@ void add_long_closebrace_comment()
             }
          }
          else if (  br_open->GetParentType() == CT_SWITCH
-                 && sw_pc != nullptr)
+                 && sw_pc->IsNotNullChunk())
          {
             log_rule_B("mod_add_long_switch_closebrace_comment");
             nl_min = options::mod_add_long_switch_closebrace_comment();
@@ -1158,7 +1150,7 @@ void add_long_closebrace_comment()
                     __func__, __LINE__, xstr.c_str());
          }
          else if (  br_open->GetParentType() == CT_NAMESPACE
-                 && ns_pc != nullptr)
+                 && ns_pc->IsNotNullChunk())
          {
             log_rule_B("mod_add_long_namespace_closebrace_comment");
             nl_min = options::mod_add_long_namespace_closebrace_comment();
@@ -1210,10 +1202,19 @@ void add_long_closebrace_comment()
             && nl_count >= nl_min
             && tag_pc->IsNotNullChunk())
          {
-            // use the comment style that fits to the selected language
-            const E_Token style = language_is_set(LANG_CPP | LANG_CS)
-                                    ? CT_COMMENT_CPP : CT_COMMENT;
+            E_Token style;
 
+            if (options::mod_add_force_c_closebrace_comment())
+            {
+               // force the C comment style
+               style = CT_COMMENT;
+            }
+            else
+            {
+               // use the comment style that fits to the selected language
+               style = language_is_set(LANG_CPP | LANG_CS)
+                          ? 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());
@@ -1319,7 +1320,7 @@ static Chunk *mod_case_brace_remove(Chunk *br_open)
          && pc->IsNot(CT_BRACE_CLOSE)))
    {
       LOG_FMT(LMCB, "%s(%d):  - after '%s'\n",
-              __func__, __LINE__, (pc == nullptr) ? "<null>" : get_token_name(pc->GetType()));
+              __func__, __LINE__, (pc->IsNullChunk()) ? "null chuck" : get_token_name(pc->GetType()));
       return(next);
    }
 
@@ -1477,8 +1478,7 @@ static void mod_case_brace()
       pc = pc->GetNextNcNnlNpp();
    }
 
-   while (  pc != nullptr
-         && pc->IsNotNullChunk())
+   while (pc->IsNotNullChunk())
    {
       Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
 
@@ -1527,8 +1527,7 @@ static void process_if_chain(Chunk *br_start)
 
    Chunk *pc = br_start;
 
-   while (  pc != nullptr
-         && pc->IsNotNullChunk())
+   while (pc->IsNotNullChunk())
    {
       LOG_CHUNK(LTOK, pc);
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/braces.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/braces.h
index 763b6470..2536aabf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/braces.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/braces.h
@@ -25,9 +25,9 @@ void add_long_closebrace_comment();
 
 /**
  * Adds a comment after the ref chunk
- * Returns the added chunk or nullptr
+ * Returns the added chunk or Chunk::NullChunkPtr
  */
-Chunk *insert_comment_after(Chunk *ref, E_Token cmt_type, const unc_text &cmt_text);
+Chunk *insert_comment_after(Chunk *ref, E_Token cmt_type, const UncText &cmt_text);
 
 
 #endif /* BRACES_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/calculate_closing_brace_position.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/calculate_closing_brace_position.cpp
index db48a5e3..eda1c8e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/calculate_closing_brace_position.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/calculate_closing_brace_position.cpp
@@ -123,8 +123,8 @@ Chunk *calculate_closing_brace_position(const Chunk *cl_colon, Chunk *pc)
          }
          else
          {
-            LOG_FMT(LMCB, "\n\n%s(%d):\n", __func__, __LINE__);
-            fprintf(stderr, "FATAL: second is nullptr\n");
+            LOG_FMT(LMCB, "\n\n%s(%d): FATAL: second is null chunk\n", __func__, __LINE__);
+            fprintf(stderr, "FATAL: second is null chunk\n");
             fprintf(stderr, "Please make a report.\n");
             exit(EX_SOFTWARE);
          }
@@ -136,7 +136,7 @@ Chunk *calculate_closing_brace_position(const Chunk *cl_colon, Chunk *pc)
    }
    else
    {
-      LOG_FMT(LMCB, "\n\n%s(%d):\n", __func__, __LINE__);
+      LOG_FMT(LMCB, "\n\n%s(%d): FATAL: erst_found is not 3 or 4\n", __func__, __LINE__);
       fprintf(stderr, "FATAL: erst_found is not 3 or 4\n");
       fprintf(stderr, "Please make a report.\n");
       exit(EX_SOFTWARE);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/calculate_closing_brace_position.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/calculate_closing_brace_position.h
index 6d2b0f06..6d2b0f06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/calculate_closing_brace_position.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/calculate_closing_brace_position.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/change_int_types.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/change_int_types.cpp
index 06875edb..e87f598b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/change_int_types.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/change_int_types.cpp
@@ -78,11 +78,11 @@ static void add_or_remove_int_keyword(Chunk *pc, Chunk *sibling, iarf_e action,
       {
          if (sibling == int_keyword)
          {
-            int_keyword = nullptr;
+            int_keyword = Chunk::NullChunkPtr;
          }
          Chunk::Delete(sibling);
       }
-      else if (  int_keyword != nullptr
+      else if (  int_keyword->IsNotNullChunk()
               && int_keyword != sibling)
       {
          // We added an int keyword, but now we see that there already was one.
@@ -107,7 +107,7 @@ static void add_or_remove_int_keyword(Chunk *pc, Chunk *sibling, iarf_e action,
       if (  action == IARF_ADD
          || action == IARF_FORCE)
       {
-         if (int_keyword)
+         if (int_keyword->IsNotNullChunk())
          {
             // There was already an int keyword. Either keep it and don't add a
             // new one or delete it to make way for the new one.
@@ -141,7 +141,7 @@ void change_int_types()
 
    Chunk *prev;
    Chunk *next;
-   Chunk *int_keyword = nullptr;
+   Chunk *int_keyword = Chunk::NullChunkPtr;
 
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
@@ -180,7 +180,7 @@ void change_int_types()
       else if (  strcmp(pc->Text(), "int") != 0
               && !is_storage_keyword(pc))
       {
-         int_keyword = nullptr; // We are no longer in a variable declaration
+         int_keyword = Chunk::NullChunkPtr; // We are no longer in a variable declaration
       }
    }
 } // change_int_types
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/change_int_types.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/change_int_types.h
index b392a5d7..b392a5d7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/change_int_types.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/change_int_types.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/char_table.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/char_table.h
index bcc30404..bcc30404 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/char_table.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/char_table.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/check_template.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/check_template.cpp
new file mode 100644
index 00000000..870b3316
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/check_template.cpp
@@ -0,0 +1,536 @@
+/**
+ * @file check_template.cpp
+ *
+ * splitted from tokenize_cleanup.cpp
+ *
+ * @author  Guy Maurel 2022
+ * @license GPL v2+
+ */
+
+#include "tokenize_cleanup.h"
+
+#include "check_template.h"
+#include "chunk.h"
+#include "combine.h"
+#include "flag_braced_init_list.h"
+#include "flag_decltype.h"
+#include "prototypes.h"
+
+
+using namespace uncrustify;
+
+
+bool invalid_open_angle_template(Chunk *prev)
+{
+   if (prev->IsNullChunk())
+   {
+      return(false);
+   }
+   // A template requires a word/type right before the open angle
+   return(  prev->IsNot(CT_WORD)
+         && prev->IsNot(CT_TYPE)
+         && prev->IsNot(CT_COMMA)
+         && prev->IsNot(CT_QUALIFIER)
+         && prev->IsNot(CT_OPERATOR_VAL)
+         && prev->GetParentType() != CT_OPERATOR);
+}
+
+
+Chunk *handle_double_angle_close(Chunk *pc)
+{
+   Chunk *next = pc->GetNext();
+
+   if (next->IsNotNullChunk())
+   {
+      if (  pc->Is(CT_ANGLE_CLOSE)
+         && next->Is(CT_ANGLE_CLOSE)
+         && pc->GetParentType() == CT_NONE
+         && (pc->GetOrigColEnd() + 1) == next->GetOrigCol()
+         && next->GetParentType() == CT_NONE)
+      {
+         pc->Str().append('>');
+         pc->SetType(CT_SHIFT);
+         pc->SetOrigColEnd(next->GetOrigColEnd());
+
+         Chunk *tmp = next->GetNextNcNnl();
+         Chunk::Delete(next);
+         next = tmp;
+      }
+      else
+      {
+         // bug #663
+         pc->SetType(CT_COMPARE);
+      }
+   }
+   return(next);
+}
+
+
+void check_template(Chunk *start, bool in_type_cast)
+{
+   LOG_FMT(LTEMPL, "%s(%d): orig line %zu, orig col %zu:\n",
+           __func__, __LINE__, start->GetOrigLine(), start->GetOrigCol());
+
+   Chunk *prev = start->GetPrevNcNnl(E_Scope::PREPROC);
+
+   if (prev->IsNullChunk())
+   {
+      return;
+   }
+   Chunk *end;
+   Chunk *pc;
+
+   if (prev->Is(CT_TEMPLATE))
+   {
+      LOG_FMT(LTEMPL, "%s(%d): CT_TEMPLATE:\n", __func__, __LINE__);
+
+      // We have: "template< ... >", which is a template declaration
+      size_t level  = 1;
+      size_t parens = 0;
+
+      for (pc = start->GetNextNcNnl(E_Scope::PREPROC);
+           pc->IsNotNullChunk();
+           pc = pc->GetNextNcNnl(E_Scope::PREPROC))
+      {
+         LOG_FMT(LTEMPL, "%s(%d): type is %s, level is %zu\n",
+                 __func__, __LINE__, get_token_name(pc->GetType()), level);
+
+         if (  (pc->GetStr()[0] == '>')
+            && (pc->Len() > 1))
+         {
+            if (pc->GetStr()[1] == '=')                         // Issue #1462 and #2565
+            {
+               LOG_FMT(LTEMPL, "%s(%d): do not split '%s' at orig line %zu, orig col %zu\n",
+                       __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
+            }
+            else
+            {
+               LOG_FMT(LTEMPL, "%s(%d): {split '%s' at orig line %zu, orig col %zu}\n",
+                       __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
+               split_off_angle_close(pc);
+            }
+         }
+
+         if (pc->Is(CT_DECLTYPE))
+         {
+            flag_cpp_decltype(pc);
+         }
+         else if (pc->Is(CT_PAREN_OPEN))
+         {
+            ++parens;
+         }
+         else if (pc->Is(CT_PAREN_CLOSE))
+         {
+            --parens;
+         }
+
+         if (parens == 0)
+         {
+            if (pc->IsString("<"))
+            {
+               level++;
+            }
+            else if (pc->IsString(">"))
+            {
+               if (level == 0)
+               {
+                  fprintf(stderr, "%s(%d): level is ZERO, cannot be decremented, at line %zu, column %zu\n",
+                          __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
+                  log_flush(true);
+                  exit(EX_SOFTWARE);
+               }
+               level--;
+
+               if (level == 0)
+               {
+                  break;
+               }
+            }
+         }
+      }
+
+      end = pc;
+   }
+   else
+   {
+      /*
+       * We may have something like "a< ... >", which is a template where
+       * '...' may consist of anything except a semicolon, unbalanced
+       * parens, or braces (with one exception being braced initializers
+       * embedded within decltypes).
+       *
+       * For example, braces may be encountered as such in the following
+       * snippet of valid C++ code:
+       *
+       * template<typename T,
+       *          typename = enable_if_t<is_same<typename decay<T>::type,
+       *                                          decltype (make_index_sequence<5> { })>::value>>
+       * void foo(T &&arg)
+       * {
+       *
+       * }
+       *
+       * Finally, if we are inside an 'if' statement and hit a CT_BOOL,
+       * then it isn't a template.
+       */
+
+      if (invalid_open_angle_template(prev))
+      {
+         LOG_FMT(LTEMPL, "%s(%d): - after type %s + ( - Not a template\n",
+                 __func__, __LINE__, get_token_name(prev->GetType()));
+         start->SetType(CT_COMPARE);
+         return;
+      }
+      LOG_FMT(LTEMPL, "%s(%d): - prev->GetType() is %s -\n",
+              __func__, __LINE__, get_token_name(prev->GetType()));
+
+      // Scan back and make sure we aren't inside square parenthesis
+      bool in_if         = false;
+      bool hit_semicolon = false;
+      pc = start->GetPrevNcNnl(E_Scope::PREPROC);
+
+      while (pc->IsNotNullChunk())
+      {
+         if (  (  pc->Is(CT_SEMICOLON)
+               && hit_semicolon)
+            || pc->Is(CT_SQUARE_CLOSE))
+         {
+            break;
+         }
+
+         if (pc->Is(CT_DECLTYPE))
+         {
+            flag_cpp_decltype(pc);
+         }
+
+         if (pc->Is(CT_BRACE_OPEN))
+         {
+            if (  !pc->TestFlags(PCF_IN_DECLTYPE)
+               || !detect_cpp_braced_init_list(pc->GetPrev(), pc))
+            {
+               break;
+            }
+            flag_cpp_braced_init_list(pc->GetPrev(), pc);
+         }
+
+         if (  pc->Is(CT_BRACE_CLOSE)
+            && pc->GetParentType() != CT_BRACED_INIT_LIST
+            && !pc->TestFlags(PCF_IN_DECLTYPE))
+         {
+            break;
+         }
+
+         if (  pc->Is(CT_SEMICOLON)
+            && !hit_semicolon)
+         {
+            hit_semicolon = true;
+         }
+
+         if (  (  (  pc->Is(CT_IF)
+                  || pc->Is(CT_RETURN)
+                  || pc->Is(CT_WHILE)
+                  || pc->Is(CT_WHILE_OF_DO))
+               && !hit_semicolon)
+            || (  pc->Is(CT_FOR)
+               && hit_semicolon))
+         {
+            in_if = true;
+            break;
+         }
+         pc = pc->GetPrevNcNnl(E_Scope::PREPROC);
+      }
+      /*
+       * Scan forward to the angle close
+       * If we have a comparison in there, then it can't be a template.
+       */
+      const int max_token_count = 1024;
+      E_Token   tokens[max_token_count];
+      size_t    num_tokens = 1;
+
+      tokens[0] = CT_ANGLE_OPEN;
+
+      for (pc = start->GetNextNcNnl(E_Scope::PREPROC);
+           pc->IsNotNullChunk();
+           pc = pc->GetNextNcNnl(E_Scope::PREPROC))
+      {
+         constexpr static auto LCURRENT = LTEMPL;
+
+         LOG_FMT(LTEMPL, "%s(%d): pc orig line is %zu, orig col is %zu, type is %s, num_tokens is %zu\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()), num_tokens);
+
+         log_rule_B("tok_split_gte");
+
+         if (pc->Is(CT_BRACE_OPEN))                     // Issue #2886
+         {
+            // look for the closing brace
+            Chunk *A = pc->GetClosingParen();
+            LOG_FMT(LTEMPL, "%s(%d): A orig line is %zu, orig col is %zu, type is %s\n",
+                    __func__, __LINE__, A->GetOrigLine(), A->GetOrigCol(), get_token_name(A->GetType()));
+            pc = A->GetNext();
+         }
+
+         if (  (tokens[num_tokens - 1] == CT_ANGLE_OPEN)
+            && (pc->GetStr()[0] == '>')
+            && (pc->Len() > 1)
+            && (  options::tok_split_gte()
+               || (  (  pc->IsString(">>")
+                     || pc->IsString(">>>"))
+                  && (  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->GetOrigLine(), pc->GetOrigCol());
+
+            split_off_angle_close(pc);
+         }
+
+         if (pc->IsString("<"))
+         {
+            if (  num_tokens > 0 && (tokens[num_tokens - 1] == CT_PAREN_OPEN)
+               && invalid_open_angle_template(pc->GetPrev()))
+            {
+               pc->SetType(CT_COMPARE); // Issue #3127
+            }
+            else
+            {
+               tokens[num_tokens] = CT_ANGLE_OPEN;
+               num_tokens++;
+            }
+         }
+         else if (pc->IsString(">"))
+         {
+            if (num_tokens > 0 && (tokens[num_tokens - 1] == CT_PAREN_OPEN))
+            {
+               handle_double_angle_close(pc);
+            }
+            else if (--num_tokens <= 0)
+            {
+               break;
+            }
+            else if (tokens[num_tokens] != CT_ANGLE_OPEN)
+            {
+               break; // unbalanced parentheses
+            }
+         }
+         else if (  in_if
+                 && (  pc->Is(CT_BOOL)
+                    || pc->Is(CT_COMPARE)))
+         {
+            break;
+         }
+         else if (pc->Is(CT_BRACE_OPEN))
+         {
+            if (  !pc->TestFlags(PCF_IN_DECLTYPE)
+               || !detect_cpp_braced_init_list(pc->GetPrev(), pc))
+            {
+               break;
+            }
+            auto brace_open  = pc->GetNextNcNnl();
+            auto brace_close = brace_open->GetClosingParen();
+
+            brace_open->SetParentType(CT_BRACED_INIT_LIST);
+            brace_close->SetParentType(CT_BRACED_INIT_LIST);
+         }
+         else if (  pc->Is(CT_BRACE_CLOSE)
+                 && pc->GetParentType() != CT_BRACED_INIT_LIST
+                 && !pc->TestFlags(PCF_IN_DECLTYPE))
+         {
+            break;
+         }
+         else if (pc->Is(CT_SEMICOLON))
+         {
+            break;
+         }
+         else if (pc->Is(CT_PAREN_OPEN))
+         {
+            if (num_tokens >= max_token_count - 1)
+            {
+               break;
+            }
+            tokens[num_tokens] = CT_PAREN_OPEN;
+            num_tokens++;
+         }
+         else if (  pc->Is(CT_QUESTION)                    // Issue #2949
+                 && language_is_set(LANG_CPP))
+         {
+            break;
+         }
+         else if (pc->Is(CT_PAREN_CLOSE))
+         {
+            if (num_tokens == 0)
+            {
+               fprintf(stderr, "%s(%d): num_tokens is ZERO, cannot be decremented, at line %zu, column %zu\n",
+                       __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
+               log_flush(true);
+               exit(EX_SOFTWARE);
+            }
+            num_tokens--;
+
+            if (tokens[num_tokens] != CT_PAREN_OPEN)
+            {
+               break;  // unbalanced parentheses
+            }
+         }
+      }
+
+      end = pc;
+   }
+
+   if (end->Is(CT_ANGLE_CLOSE))
+   {
+      pc = end->GetNextNcNnl(E_Scope::PREPROC);
+
+      if (  pc->IsNullChunk()
+         || pc->IsNot(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",
+                 __func__, __LINE__, start->GetOrigLine(), start->GetOrigCol());
+         LOG_FMT(LTEMPL, "%s(%d):     to   orig line %zu, orig col %zu\n",
+                 __func__, __LINE__, end->GetOrigLine(), end->GetOrigCol());
+         start->SetParentType(CT_TEMPLATE);
+
+         check_template_args(start, end);
+
+         end->SetParentType(CT_TEMPLATE);
+         end->SetFlagBits(PCF_IN_TEMPLATE);
+         return;
+      }
+   }
+   LOG_FMT(LTEMPL, "%s(%d): - Not a template: end = %s\n",
+           __func__, __LINE__, (end->IsNotNullChunk() ? get_token_name(end->GetType()) : "<null>"));
+   start->SetType(CT_COMPARE);
+} // check_template
+
+
+void check_template_arg(Chunk *start, Chunk *end)
+{
+   LOG_FMT(LTEMPL, "%s(%d): Template argument detected\n", __func__, __LINE__);
+   LOG_FMT(LTEMPL, "%s(%d):     from orig line %zu, orig col %zu\n",
+           __func__, __LINE__, start->GetOrigLine(), start->GetOrigCol());
+   LOG_FMT(LTEMPL, "%s(%d):     to   orig line %zu, orig col %zu\n",
+           __func__, __LINE__, end->GetOrigLine(), end->GetOrigCol());
+
+   // Issue #1127
+   // MyFoo<mySize * 2> foo1;
+   // MyFoo<2*mySize * 2> foo1;
+   // Issue #1346
+   // use it as ONE line:
+   //   typename std::enable_if<!std::is_void<T>::value,
+   //   QVector<T> >::type dummy(const std::function<T*(const S&)>&
+   //   pFunc, const QVector<S>& pItems)
+   // we need two runs
+   // 1. run to test if expression is numeric
+   bool  expressionIsNumeric = false;
+   Chunk *pc                 = start;
+
+   while (pc != end)
+   {
+      Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
+      pc->SetFlagBits(PCF_IN_TEMPLATE);
+
+      if (  pc->Is(CT_DECLTYPE)
+         || pc->Is(CT_SIZEOF))
+      {
+         expressionIsNumeric = true;
+         break;
+      }
+
+      if (next->IsNot(CT_PAREN_OPEN))
+      {
+         if (  pc->Is(CT_NUMBER)
+            || pc->Is(CT_ARITH)
+            || pc->Is(CT_SHIFT))
+         {
+            expressionIsNumeric = true;
+            break;
+         }
+      }
+      pc = next;
+   }
+   LOG_FMT(LTEMPL, "%s(%d): expressionIsNumeric is %s\n",
+           __func__, __LINE__, expressionIsNumeric ? "TRUE" : "FALSE");
+
+   // 2. run to do the work
+   if (!expressionIsNumeric)
+   {
+      pc = start;
+
+      while (pc != end)
+      {
+         Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
+         pc->SetFlagBits(PCF_IN_TEMPLATE);
+
+         Chunk *prev  = pc->GetPrevNcNnl(E_Scope::PREPROC);
+         Chunk *prev2 = prev->GetPrevNcNnl(E_Scope::PREPROC);
+
+         if (  prev->Is(CT_ELLIPSIS)                 // Issue #3309
+            && prev2->Is(CT_TYPENAME))
+         {
+            pc->SetType(CT_PARAMETER_PACK);
+         }
+         else
+         {
+            make_type(pc);
+         }
+         pc = next;
+      }
+   }
+} // check_template_arg
+
+
+void check_template_args(Chunk *start, Chunk *end)
+{
+   std::vector<E_Token> tokens;
+
+   // Scan for commas
+   Chunk *pc;
+
+   for (pc = start->GetNextNcNnl(E_Scope::PREPROC);
+        pc->IsNotNullChunk() && pc != end;
+        pc = pc->GetNextNcNnl(E_Scope::PREPROC))
+   {
+      switch (pc->GetType())
+      {
+      case CT_COMMA:
+
+         if (tokens.empty())
+         {
+            // Check current argument
+            check_template_args(start, pc);
+            start = pc;
+         }
+         break;
+
+      case CT_ANGLE_OPEN:
+      case CT_PAREN_OPEN:
+         tokens.push_back(pc->GetType());
+         break;
+
+      case CT_ANGLE_CLOSE:
+
+         if (  !tokens.empty()
+            && tokens.back() == CT_ANGLE_OPEN)
+         {
+            tokens.pop_back();
+         }
+         break;
+
+      case CT_PAREN_CLOSE:
+
+         if (  !tokens.empty()
+            && tokens.back() == CT_PAREN_OPEN)
+         {
+            tokens.pop_back();
+         }
+         break;
+
+      default:
+         break;
+      }
+   }
+
+   // Check whatever is left
+   check_template_arg(start, end);
+} // check_template_args
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/check_template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/check_template.h
new file mode 100644
index 00000000..d65f2504
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/check_template.h
@@ -0,0 +1,55 @@
+/**
+ * @file check_template.h
+ * prototypes for check_template.cpp
+ *
+ * splitted from tokenize_cleanup.cpp
+ *
+ * @author  Guy Maurel 2022
+ * @license GPL v2+
+ */
+#ifndef CHECK_TEMPLATE_H_INCLUDED
+#define CHECK_TEMPLATE_H_INCLUDED
+
+#include "uncrustify_types.h"
+
+
+/**
+ * Mark types in a single template argument.
+ *
+ * @param start  chunk to start check at
+ * @param end    chunk to end check at
+ */
+void check_template_arg(Chunk *start, Chunk *end);
+
+
+/**
+ * Mark types in template argument(s).
+ *
+ * @param start  chunk to start check at
+ * @param end    chunk to end check at
+ */
+void check_template_args(Chunk *start, Chunk *end);
+
+
+/**
+ * If there is nothing but CT_WORD and CT_MEMBER, then it's probably a
+ * template thingy.  Otherwise, it's likely a comparison.
+ *
+ * @param start  chunk to start check at
+ */
+void check_template(Chunk *start, bool in_type_cast);
+
+
+/**
+ * Convert '>' + '>' into '>>'
+ * If we only have a single '>', then change it to CT_COMPARE.
+ *
+ * @param pc  chunk to start at
+ */
+Chunk *handle_double_angle_close(Chunk *pc);
+
+
+bool invalid_open_angle_template(Chunk *prev);
+
+
+#endif /* CHECK_TEMPLATE_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/chunk.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/chunk.cpp
index 125879b6..35d9281c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/chunk.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/chunk.cpp
@@ -41,16 +41,16 @@ void Chunk::CopyFrom(const Chunk &o)
    m_ppLevel      = o.m_ppLevel;
    m_afterTab     = o.m_afterTab;
 
-   m_flags         = o.m_flags;
-   m_alignmentData = o.m_alignmentData;
-   m_indentData    = o.m_indentData;
+   m_flags           = o.m_flags;
+   m_alignmentData   = o.m_alignmentData;
+   m_indentationData = o.m_indentationData;
 
    m_next   = Chunk::NullChunkPtr;
    m_prev   = Chunk::NullChunkPtr;
    m_parent = Chunk::NullChunkPtr;
 
    m_str          = o.m_str;
-   m_trackingData = o.m_trackingData;
+   m_trackingList = o.m_trackingList;
 }
 
 
@@ -73,7 +73,10 @@ void Chunk::Reset()
 
    m_flags = PCF_NONE;
    memset(&m_alignmentData, 0, sizeof(m_alignmentData));
-   memset(&m_indentData, 0, sizeof(m_indentData));
+   m_alignmentData.next  = NullChunkPtr;
+   m_alignmentData.start = NullChunkPtr;
+   m_alignmentData.ref   = NullChunkPtr;
+   memset(&m_indentationData, 0, sizeof(m_indentationData));
 
    m_next   = Chunk::NullChunkPtr;
    m_prev   = Chunk::NullChunkPtr;
@@ -81,7 +84,7 @@ void Chunk::Reset()
 
    // for debugging purpose only
    m_str.clear();
-   m_trackingData = nullptr;
+   m_trackingList = nullptr;
 }
 
 
@@ -241,9 +244,9 @@ Chunk *Chunk::SearchTypeLevel(const E_Token type, const E_Scope scope,
    T_SearchFnPtr searchFnPtr = GetSearchFn(dir);
    Chunk         *pc         = const_cast<Chunk *>(this);
 
-   do                                                // loop over the chunk list
+   do                                              // loop over the chunk list
    {
-      pc = (pc->*searchFnPtr)(scope);                // in either direction while
+      pc = (pc->*searchFnPtr)(scope);              // in either direction while
    } while (  pc->IsNotNullChunk()                 // the end of the list was not reached yet
            && (!pc->IsTypeAndLevel(type, level))); // and the chunk was not found either
 
@@ -251,19 +254,19 @@ Chunk *Chunk::SearchTypeLevel(const E_Token type, const E_Scope scope,
 }
 
 
-Chunk *Chunk::SearchStringLevel(const char *cStr, const size_t len, int level,
+Chunk *Chunk::SearchStringLevel(const char *str, const size_t len, int level,
                                 const E_Scope scope, const E_Direction dir) const
 {
    T_SearchFnPtr searchFnPtr = GetSearchFn(dir);
    Chunk         *pc         = const_cast<Chunk *>(this);
 
-   do                                                          // loop over the chunk list
+   do                                                        // loop over the chunk list
    {
-      pc = (pc->*searchFnPtr)(scope);                          // in either direction while
-   } while (  pc->IsNotNullChunk()                            // the end of the list was not reached yet
-           && !pc->IsStringAndLevel(cStr, len, true, level)); // and the demanded chunk was not found either
+      pc = (pc->*searchFnPtr)(scope);                        // in either direction while
+   } while (  pc->IsNotNullChunk()                           // the end of the list was not reached yet
+           && !pc->IsStringAndLevel(str, len, true, level)); // and the demanded chunk was not found either
 
-   return(pc);                                                // the latest chunk is the searched one
+   return(pc);                                               // the latest chunk is the searched one
 }
 
 
@@ -331,8 +334,7 @@ static void chunk_log_msg(Chunk *chunk, const log_sev_t log, const char *str)
 
 static void chunk_log(Chunk *pc, const char *text)
 {
-   if (  pc != nullptr
-      && pc->IsNotNullChunk()
+   if (  pc->IsNotNullChunk()
       && (cpd.unc_stage != unc_stage_e::TOKENIZE)
       && (cpd.unc_stage != unc_stage_e::CLEANUP))
    {
@@ -525,12 +527,12 @@ void Chunk::SwapLines(Chunk *other)
 } // Chunk::SwapLines
 
 
-void Chunk::SetResetFlags(T_PcfFlags resetBits, T_PcfFlags setBits)
+void Chunk::SetResetFlags(PcfFlags resetBits, PcfFlags setBits)
 {
    if (IsNotNullChunk())
    {
       LOG_FUNC_ENTRY();
-      const T_PcfFlags newFlags = (m_flags & ~resetBits) | setBits;
+      const PcfFlags newFlags = (m_flags & ~resetBits) | setBits;
 
       if (m_flags != newFlags)
       {
@@ -538,9 +540,9 @@ void Chunk::SetResetFlags(T_PcfFlags resetBits, T_PcfFlags setBits)
                  "%s(%d): %016llx^%016llx=%016llx\n"
                  "%s(%d): orig line is %zu, orig col is %zu, Text() is '%s', type is %s,",
                  __func__, __LINE__,
-                 static_cast<T_PcfFlags::int_t>(m_flags),
-                 static_cast<T_PcfFlags::int_t>(m_flags ^ newFlags),
-                 static_cast<T_PcfFlags::int_t>(newFlags),
+                 static_cast<PcfFlags::int_t>(m_flags),
+                 static_cast<PcfFlags::int_t>(m_flags ^ newFlags),
+                 static_cast<PcfFlags::int_t>(newFlags),
                  __func__, __LINE__, m_origLine, m_origCol, Text(), get_token_name(m_type));
          LOG_FMT(LSETFLG, "  parent type is %s,\n",
                  get_token_name(m_parentType));
@@ -556,7 +558,7 @@ void Chunk::SetResetFlags(T_PcfFlags resetBits, T_PcfFlags setBits)
 }
 
 
-void Chunk::SetTypeReal(const E_Token token, const char *func, const int line)
+void Chunk::SetType(const E_Token token)
 {
    LOG_FUNC_ENTRY();
 
@@ -566,7 +568,7 @@ void Chunk::SetTypeReal(const E_Token token, const char *func, const int line)
       return;
    }
    LOG_FMT(LSETTYP, "%s(%d): orig line is %zu, orig col is %zu, Text() is ",
-           func, line, m_origLine, m_origCol);
+           __func__, __LINE__, m_origLine, m_origCol);
 
    if (token == CT_NEWLINE)
    {
@@ -582,7 +584,7 @@ void Chunk::SetTypeReal(const E_Token token, const char *func, const int line)
 }
 
 
-void Chunk::SetParentTypeReal(const E_Token token, const char *func, const int line)
+void Chunk::SetParentType(const E_Token token)
 {
    LOG_FUNC_ENTRY();
 
@@ -592,7 +594,7 @@ void Chunk::SetParentTypeReal(const E_Token token, const char *func, const int l
       return;
    }
    LOG_FMT(LSETPAR, "%s(%d): orig line is %zu, orig col is %zu, Text() is ",
-           func, line, m_origLine, m_origCol);
+           __func__, __LINE__, m_origLine, m_origCol);
 
    if (token == CT_NEWLINE)
    {
@@ -639,8 +641,7 @@ Chunk *Chunk::CopyAndAdd(Chunk *pos, const E_Direction dir) const
 
    Chunk *pc = new Chunk(*this);
 
-   if (  pos != nullptr
-      && pos->IsNotNullChunk())
+   if (pos->IsNotNullChunk())
    {
       (dir == E_Direction::FORWARD) ? gChunkList.AddAfter(pc, pos) : gChunkList.AddBefore(pc, pos);
    }
@@ -769,16 +770,16 @@ bool Chunk::IsOCForinOpenParen() const
 }
 
 
-bool Chunk::IsStringAndLevel(const char *cStr, const size_t len,
+bool Chunk::IsStringAndLevel(const char *str, const size_t len,
                              bool caseSensitive, const int level) const
 {
    return(  (  level < 0
             || m_level == static_cast<size_t>(level))
          && Len() == len                                    // the length is as expected
          && (  (  caseSensitive
-               && memcmp(Text(), cStr, len) == 0)
+               && memcmp(Text(), str, len) == 0)
             || (  !caseSensitive
-               && strncasecmp(Text(), cStr, len) == 0)));   // the strings are equal
+               && strncasecmp(Text(), str, len) == 0)));   // the strings are equal
 }
 
 
@@ -839,6 +840,7 @@ bool Chunk::IsColon() const
          || Is(CT_CONSTR_COLON)
          || Is(CT_CS_SQ_COLON)
          || Is(CT_D_ARRAY_COLON)
+         || Is(CT_ENUM_COLON)
          || Is(CT_FOR_COLON)
          || Is(CT_LABEL_COLON)
          || Is(CT_OC_COLON)
@@ -894,3 +896,20 @@ bool Chunk::IsNewlineBetween(const Chunk *other) const
    }
    return(false);
 }
+
+
+void shift_the_rest_of_the_line(Chunk *first)
+{
+   // shift all the tokens in this line to the right  Issue #3236
+   for (Chunk *temp = first; ; temp = temp->GetNext())
+   {
+      temp->SetColumn(temp->GetColumn() + 1);                         // Issue #3236
+      temp->SetOrigCol(temp->GetOrigCol() + 1);                       // Issue #3236
+      temp->SetOrigColEnd(temp->GetOrigColEnd() + 1);                 // Issue #3236
+
+      if (temp->Is(CT_NEWLINE))
+      {
+         break;
+      }
+   }
+} //shift_the_rest_of_the_line
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/chunk.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/chunk.h
index fe705fe1..7d7e0167 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/chunk.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/chunk.h
@@ -3,6 +3,7 @@
  * Manages and navigates the list of chunks.
  *
  * @author  Ben Gardner
+ * @author  Guy Maurel
  * @license GPL v2+
  */
 
@@ -12,6 +13,7 @@
 #include "uncrustify_types.h"
 // necessary to not sort it
 #include "char_table.h"
+#include "language_names.h"
 #include "language_tools.h"
 
 
@@ -59,8 +61,8 @@ public:
    Chunk &operator=(const Chunk &o);              // !!! partial copy: chunk is not linked to others
 
    //! whether this is a null Chunk or not
-   bool IsNullChunk() const { return(null_chunk); }
-   bool IsNotNullChunk() const { return(!null_chunk); }
+   bool IsNullChunk() const { return(m_nullChunk); }
+   bool IsNotNullChunk() const { return(!m_nullChunk); }
 
    //! sets all elements of the struct to their default value
    void Reset();
@@ -76,10 +78,8 @@ public:
    /**
     * @brief Sets the chunk type
     * @param token the type to set
-    * @param func the name of the function from where this method is called (for log purposes)
-    * @param line the line number from where this method is called (for log purposes)
     */
-   void SetTypeReal(const E_Token token, const char *func, const int line);
+   void SetType(const E_Token token);
 
    /**
     * @brief Returns the parent type of the chunk
@@ -89,10 +89,8 @@ public:
    /**
     * @brief Sets the type of the parent chunk
     * @param token the type to set
-    * @param func the name of the function from where this method is called (for log purposes)
-    * @param line the line number from where this method is called (for log purposes)
     */
-   void SetParentTypeReal(const E_Token token, const char *func, const int line);
+   void SetParentType(const E_Token token);
 
    /**
     * @brief Returns the parent of the chunk
@@ -108,32 +106,32 @@ public:
    /**
     * @brief Returns the alignment data of the chunk as a const reference
     */
-   const T_AlignData &GetAlignmentData() const;
+   const AlignmentData &GetAlignData() const;
 
    /**
     * @brief Returns the alignment data of the chunk as a modifiable reference
     */
-   T_AlignData &AlignmentData();
+   AlignmentData &AlignData();
 
    /**
     * @brief Returns the indentation data of the chunk as a const reference
     */
-   const T_IndentData &GetIndentData() const;
+   const IndentationData &GetIndentData() const;
 
    /**
     * @brief Returns the indentation data of the chunk as a modifiable reference
     */
-   T_IndentData &IndentData();
+   IndentationData &IndentData();
 
    /**
     * @brief Returns the text data of the chunk as a const reference
     */
-   const unc_text &GetStr() const;
+   const UncText &GetStr() const;
 
    /**
     * @brief Returns the text data of the chunk as a modifiable reference
     */
-   unc_text &Str();
+   UncText &Str();
 
    /**
     * @brief returns the number of characters in the chunk text	string
@@ -153,12 +151,12 @@ public:
    /**
     * @brief Returns the tracking data of the chunk as a const reference
     */
-   const track_list *GetTrackingData() const;
+   const TrackList *GetTrackingData() const;
 
    /**
     * @brief Returns the tracking data of the chunk as a modifiable reference
     */
-   track_list * &TrackingData();
+   TrackList * &TrackingData();
 
    /**
     * @brief Returns the type of the parent chunk
@@ -168,39 +166,39 @@ public:
    /**
     * @brief Returns the chunk flags
     */
-   T_PcfFlags GetFlags() const;
+   PcfFlags GetFlags() const;
 
    /**
     * @brief Sets the chunk flags
     * @param flags the new chunk flags
     */
-   void SetFlags(T_PcfFlags flags);
+   void SetFlags(PcfFlags flags);
 
    /**
     * @brief Tests if some chunk flags are set
     * @param flags the flag bits to test
     * @return true if the specified bits are set, false otherwise
     */
-   bool TestFlags(T_PcfFlags flags) const;
+   bool TestFlags(PcfFlags flags) const;
 
    /**
     * @brief Resets some of the chunk flag bits
     * @param resetBits the flag bits to reset
     */
-   void ResetFlagBits(T_PcfFlags resetBits);
+   void ResetFlagBits(PcfFlags resetBits);
 
    /**
     * @brief Sets some of the chunk flag bits
     * @param setBits the flag bits to set
     */
-   void SetFlagBits(T_PcfFlags setBits);
+   void SetFlagBits(PcfFlags setBits);
 
    /**
     * @brief Sets and reset some of the chunk flag bits
     * @param resetBits the flag bits to reset
     * @param setBits the flag bits to set
     */
-   void UpdateFlagBits(T_PcfFlags resetBits, T_PcfFlags setBits);
+   void UpdateFlagBits(PcfFlags resetBits, PcfFlags setBits);
 
    /**
     * @brief Returns the line number of the chunk in the input file
@@ -482,7 +480,7 @@ public:
     *        brackets. This handles stacked [] instances to accommodate
     *        multi-dimensional array declarations
     * @param scope  code region to search in
-    * @return nullptr or the next chunk not in or part of square brackets
+    * @return Chunk::NullChunkPtr or the next chunk not in or part of square brackets
     */
    Chunk *GetNextNisq(const E_Scope scope = E_Scope::ALL) const;
 
@@ -520,23 +518,23 @@ public:
 
    /**
     * @brief returns the next chunk that holds a given string at a given level.
-    * @param cStr   string to search for
+    * @param str    string to search for
     * @param len    length of string
-    * @param level the level to match or ANY_LEVEL
+    * @param level  the level to match or ANY_LEVEL
     * @param scope  code region to search in
     * @return pointer to the next matching chunk or Chunk::NullChunkPtr if no chunk was found
     */
-   Chunk *GetNextString(const char *cStr, const size_t len, const int level, const E_Scope scope = E_Scope::ALL) const;
+   Chunk *GetNextString(const char *str, const size_t len, const int level, const E_Scope scope = E_Scope::ALL) const;
 
    /**
     * @brief returns the prev chunk that holds a given string at a given level.
-    * @param cStr   string to search for
+    * @param str    string to search for
     * @param len    length of string
-    * @param level the level to match or ANY_LEVEL
+    * @param level  the level to match or ANY_LEVEL
     * @param scope  code region to search in
     * @return pointer to the prev matching chunk or Chunk::NullChunkPtr if no chunk was found
     */
-   Chunk *GetPrevString(const char *cStr, const size_t len, const int level, const E_Scope scope = E_Scope::ALL) const;
+   Chunk *GetPrevString(const char *str, const size_t len, const int level, const E_Scope scope = E_Scope::ALL) const;
 
    /**
     * @brief returns the next chunk that is not part of balanced square brackets.
@@ -561,7 +559,7 @@ public:
 
    /**
     * @brief Finds the first chunk on the line the current chunk is on.
-    * This just backs up until a newline or nullptr is hit.
+    * This just backs up until a newline or null chuck is hit.
     *
     * given: [ a - b - c - n1 - d - e - n2 ]
     * input: [ a | b | c | n1 ] => a
@@ -650,14 +648,14 @@ public:
     * with the provided string was found. Additionally a nesting level can be
     * provided to narrow down the search.
     *
-    * @param  cStr   string that searched chunk needs to have
+    * @param  str    string that searched chunk needs to have
     * @param  len    length of the string
-    * @param  level nesting level of the searched chunk, ignored when negative
+    * @param  level  nesting level of the searched chunk, ignored when negative
     * @param  scope  code parts to consider for search
     * @param  dir    search direction
     * @return pointer to the found chunk or Chunk::NullChunkPtr if no chunk was found
     */
-   Chunk *SearchStringLevel(const char *cStr, const size_t len, const int level, const E_Scope scope = E_Scope::ALL, const E_Direction dir = E_Direction::FORWARD) const;
+   Chunk *SearchStringLevel(const char *str, const size_t len, const int level, const E_Scope scope = E_Scope::ALL, const E_Direction dir = E_Direction::FORWARD) const;
 
    /**
     * @brief returns the closing match for the current paren/brace/square.
@@ -685,11 +683,11 @@ public:
 
    /**
     * @brief checks whether the chunk token name is a specific string
-    * @param cStr string to compare token name with
+    * @param str string to compare token name with
     * @param caseSensitive whether to do a case sensitive or insensitive comparison
     * @return true if the chunk token name matches the specified string, false otherwise
     */
-   bool IsString(const char *cStr, bool caseSensitive = true) const;
+   bool IsString(const char *str, bool caseSensitive = true) const;
 
    /**
     * @brief checks whether the chunk is not a specific token
@@ -796,13 +794,13 @@ public:
 
    /**
     * @brief checks whether the chunk matches a given string and level
-    * @param cStr   the expected string
+    * @param str    the expected string
     * @param len    length of the string
     * @param caseSensitive whether to do a case sensitive or insensitive comparison
     * @param level nesting level of the searched chunk, ignored when negative
     * @return true if the chunk matches a given string and level
     */
-   bool IsStringAndLevel(const char *cStr, const size_t len, bool caseSensitive, const int level) const;
+   bool IsStringAndLevel(const char *str, const size_t len, bool caseSensitive, const int level) const;
 
    /**
     * @brief checks whether the chunk is a star/asterisk
@@ -1043,40 +1041,40 @@ protected:
     * @param setBits the flag bits to set
     * @param resetBits the flag bits to reset
     */
-   void SetResetFlags(T_PcfFlags resetBits, T_PcfFlags setBits);
+   void SetResetFlags(PcfFlags resetBits, PcfFlags setBits);
 
 
    // --------- Data members
-   E_Token      m_type;                       //! type of the chunk itself
-   E_Token      m_parentType;                 //! type of the parent chunk usually CT_NONE
-   size_t       m_origLine;                   //! line number of chunk in input file
-   size_t       m_origCol;                    //! column where chunk started in the input file, is always > 0
-   size_t       m_origColEnd;                 //! column where chunk ended in the input file, is always > 1
-   size_t       m_origPrevSp;                 //! whitespace before this token
-   size_t       m_column;                     //! column of the chunk
-   size_t       m_columnIndent;               //! if 1st chunk on a line, set to the 'indent' column, which may
-                                              //! be less than the real column used to indent with tabs
-   size_t       m_nlCount;                    //! number of newlines in CT_NEWLINE
-   size_t       m_nlColumn;                   //! column of the subsequent newline entries(all of them should have the same column)
-   size_t       m_level;                      //! nest level in {, (, or [. Only to help vim command }
-   size_t       m_braceLevel;                 //! nest level in braces only
-   size_t       m_ppLevel;                    //! nest level in preprocessor
-   bool         m_afterTab;                   //! whether this token was after a tab
-
-   T_PcfFlags   m_flags;                      //! see PCF_xxx
-   T_AlignData  m_alignmentData;              //! alignment data of the chunk
-   T_IndentData m_indentData;                 //! indentation data of the chunk
-
-   Chunk        *m_next;                      //! pointer to next chunk in list
-   Chunk        *m_prev;                      //! pointer to previous chunk in list
-   Chunk        *m_parent;                    //! pointer to parent chunk (not always set)
-
-   unc_text     m_str;                        //! the token text
-   track_list   *m_trackingData;              //! for debugging purpose only
+   E_Token         m_type;                  //! type of the chunk itself
+   E_Token         m_parentType;            //! type of the parent chunk usually CT_NONE
+   size_t          m_origLine;              //! line number of chunk in input file
+   size_t          m_origCol;               //! column where chunk started in the input file, is always > 0
+   size_t          m_origColEnd;            //! column where chunk ended in the input file, is always > 1
+   size_t          m_origPrevSp;            //! whitespace before this token
+   size_t          m_column;                //! column of the chunk
+   size_t          m_columnIndent;          //! if 1st chunk on a line, set to the 'indent' column, which may
+                                            //! be less than the real column used to indent with tabs
+   size_t          m_nlCount;               //! number of newlines in CT_NEWLINE
+   size_t          m_nlColumn;              //! column of the subsequent newline entries(all of them should have the same column)
+   size_t          m_level;                 //! nest level in {, (, or [. Only to help vim command }
+   size_t          m_braceLevel;            //! nest level in braces only
+   size_t          m_ppLevel;               //! nest level in preprocessor
+   bool            m_afterTab;              //! whether this token was after a tab
+
+   PcfFlags        m_flags;                 //! see PCF_xxx
+   AlignmentData   m_alignmentData;         //! alignment data of the chunk
+   IndentationData m_indentationData;       //! indentation data of the chunk
+
+   Chunk           *m_next;                 //! pointer to next chunk in list
+   Chunk           *m_prev;                 //! pointer to previous chunk in list
+   Chunk           *m_parent;               //! pointer to parent chunk (not always set)
+
+   UncText         m_str;                   //! the token text
+   TrackList       *m_trackingList;         //! for debugging purpose only
 
 
 private:
-   const bool null_chunk;                     //! true for null chunks
+   const bool m_nullChunk;                    //! true for null chunks
 
 
 public:
@@ -1086,14 +1084,14 @@ public:
 
 
 inline Chunk::Chunk(bool null_c)
-   : null_chunk(null_c)
+   : m_nullChunk(null_c)
 {
    Reset();
 }
 
 
 inline Chunk::Chunk(const Chunk &o)
-   : null_chunk(o.null_chunk)
+   : m_nullChunk(o.m_nullChunk)
 {
    CopyFrom(o);
 }
@@ -1136,51 +1134,51 @@ inline void Chunk::SetParent(Chunk *parent)
 }
 
 
-inline const T_AlignData &Chunk::GetAlignmentData() const
+inline const AlignmentData &Chunk::GetAlignData() const
 {
    return(m_alignmentData);
 }
 
 
-inline T_AlignData &Chunk::AlignmentData()
+inline AlignmentData &Chunk::AlignData()
 {
    return(m_alignmentData);
 }
 
 
-inline const T_IndentData &Chunk::GetIndentData() const
+inline const IndentationData &Chunk::GetIndentData() const
 {
-   return(m_indentData);
+   return(m_indentationData);
 }
 
 
-inline T_IndentData &Chunk::IndentData()
+inline IndentationData &Chunk::IndentData()
 {
-   return(m_indentData);
+   return(m_indentationData);
 }
 
 
-inline const unc_text &Chunk::GetStr() const
+inline const UncText &Chunk::GetStr() const
 {
    return(m_str);
 }
 
 
-inline unc_text &Chunk::Str()
+inline UncText &Chunk::Str()
 {
    return(m_str);
 }
 
 
-inline const track_list *Chunk::GetTrackingData() const
+inline const TrackList *Chunk::GetTrackingData() const
 {
-   return(m_trackingData);
+   return(m_trackingList);
 }
 
 
-inline track_list * &Chunk::TrackingData()
+inline TrackList * &Chunk::TrackingData()
 {
-   return(m_trackingData);
+   return(m_trackingList);
 }
 
 
@@ -1206,37 +1204,37 @@ inline E_Token Chunk::GetTypeOfParent() const
 }
 
 
-inline T_PcfFlags Chunk::GetFlags() const
+inline PcfFlags Chunk::GetFlags() const
 {
    return(m_flags);
 }
 
 
-inline void Chunk::SetFlags(T_PcfFlags flags)
+inline void Chunk::SetFlags(PcfFlags flags)
 {
    m_flags = flags;
 }
 
 
-inline bool Chunk::TestFlags(T_PcfFlags flags) const
+inline bool Chunk::TestFlags(PcfFlags flags) const
 {
    return(m_flags.test(flags));
 }
 
 
-inline void Chunk::ResetFlagBits(T_PcfFlags resetBits)
+inline void Chunk::ResetFlagBits(PcfFlags resetBits)
 {
    SetResetFlags(resetBits, PCF_NONE);
 }
 
 
-inline void Chunk::SetFlagBits(T_PcfFlags setBits)
+inline void Chunk::SetFlagBits(PcfFlags setBits)
 {
    SetResetFlags(PCF_NONE, setBits);
 }
 
 
-inline void Chunk::UpdateFlagBits(T_PcfFlags resetBits, T_PcfFlags setBits)
+inline void Chunk::UpdateFlagBits(PcfFlags resetBits, PcfFlags setBits)
 {
    SetResetFlags(resetBits, setBits);
 }
@@ -1500,15 +1498,15 @@ inline Chunk *Chunk::GetPrevType(const E_Token type, const int level, const E_Sc
 }
 
 
-inline Chunk *Chunk::GetNextString(const char *cStr, const size_t len, const int level, const E_Scope scope) const
+inline Chunk *Chunk::GetNextString(const char *str, const size_t len, const int level, const E_Scope scope) const
 {
-   return(SearchStringLevel(cStr, len, level, scope, E_Direction::FORWARD));
+   return(SearchStringLevel(str, len, level, scope, E_Direction::FORWARD));
 }
 
 
-inline Chunk *Chunk::GetPrevString(const char *cStr, const size_t len, const int level, const E_Scope scope) const
+inline Chunk *Chunk::GetPrevString(const char *str, const size_t len, const int level, const E_Scope scope) const
 {
-   return(SearchStringLevel(cStr, len, level, scope, E_Direction::BACKWARD));
+   return(SearchStringLevel(str, len, level, scope, E_Direction::BACKWARD));
 }
 
 
@@ -1539,9 +1537,9 @@ inline bool Chunk::Is(E_Token token) const
 }
 
 
-inline bool Chunk::IsString(const char *cStr, bool caseSensitive) const
+inline bool Chunk::IsString(const char *str, bool caseSensitive) const
 {
-   return(IsStringAndLevel(cStr, strlen(cStr), caseSensitive, ANY_LEVEL));
+   return(IsStringAndLevel(str, strlen(str), caseSensitive, ANY_LEVEL));
 }
 
 
@@ -1792,10 +1790,8 @@ inline Chunk *Chunk::CopyAndAddBefore(Chunk *ref) const
 }
 
 
-#define SetType(tt)          SetTypeReal((tt), __unqualified_func__, __LINE__)
-
-
-#define SetParentType(tt)    SetParentTypeReal((tt), __unqualified_func__, __LINE__)
+// shift all the tokens in this line to the right  Issue #3236
+void shift_the_rest_of_the_line(Chunk *first);
 
 
 #endif /* CHUNK_LIST_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/combine.cpp
index d7f95472..a033be49 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/combine.cpp
@@ -145,7 +145,7 @@ static void handle_oc_available(Chunk *pc);
  *
  * @return the chunk after the type
  */
-static Chunk *handle_oc_md_type(Chunk *paren_open, E_Token ptype, T_PcfFlags flags, bool &did_it);
+static Chunk *handle_oc_md_type(Chunk *paren_open, E_Token ptype, PcfFlags flags, bool &did_it);
 
 /**
  * Process an C# [] thingy:
@@ -405,7 +405,7 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
 
       // For a D cast - convert the next item
       if (  pc->Is(CT_D_CAST)
-         && tmp != nullptr)
+         && tmp->IsNotNullChunk())
       {
          if (tmp->Is(CT_STAR))
          {
@@ -435,7 +435,7 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
        */
       if (pc->Is(CT_DELEGATE))
       {
-         if (tmp != nullptr)
+         if (tmp->IsNotNullChunk())
          {
             tmp->SetParentType(CT_DELEGATE);
 
@@ -460,7 +460,7 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
       }
 
       if (  pc->Is(CT_ALIGN)
-         && tmp != nullptr)
+         && tmp->IsNotNullChunk())
       {
          if (tmp->Is(CT_BRACE_OPEN))
          {
@@ -482,11 +482,6 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
          next->SetParentType(pc->GetType());
          Chunk *tmp = next->GetNext();
 
-         if (tmp == nullptr)
-         {
-            tmp = Chunk::NullChunkPtr;
-         }
-
          while (tmp->IsNotNullChunk())
          {
             if (tmp->Is(CT_PAREN_CLOSE))
@@ -637,7 +632,7 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
 
    if (pc->Is(CT_NEW))
    {
-      Chunk *ts  = nullptr;
+      Chunk *ts  = Chunk::NullChunkPtr;
       Chunk *tmp = next;
 
       if (tmp->Is(CT_TSQUARE))
@@ -651,7 +646,7 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
       {
          set_paren_parent(tmp, pc->GetType());
 
-         if (ts != nullptr)
+         if (ts->IsNotNullChunk())
          {
             ts->SetParentType(pc->GetType());
          }
@@ -741,16 +736,14 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
          {
             tmp = set_paren_parent(tmp, CT_BRACED_INIT_LIST);
 
-            if (  tmp != nullptr
-               && tmp->IsNotNullChunk())
+            if (tmp->IsNotNullChunk())
             {
                tmp->ResetFlagBits(PCF_EXPR_START | PCF_STMT_START);
             }
          }
          else
          {
-            if (  tmp != nullptr
-               && tmp->Is(CT_WORD))
+            if (tmp->Is(CT_WORD))
             {
                tmp->SetFlagBits(PCF_VAR_1ST_DEF);
             }
@@ -828,8 +821,7 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
       {
          Chunk *tmp = flag_parens(next, PCF_NONE, CT_NONE, CT_EXTERN, true);
 
-         if (  tmp != nullptr
-            && tmp->Is(CT_BRACE_OPEN))
+         if (tmp->Is(CT_BRACE_OPEN))
          {
             set_paren_parent(tmp, CT_EXTERN);
          }
@@ -1069,15 +1061,13 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
          tmp = tmp->GetNextNcNnl();
       }
 
-      if (  tmp != nullptr
-         && tmp->IsNotNullChunk())
+      if (tmp->IsNotNullChunk())
       {
          if (tmp->IsParenOpen())
          {
             tmp = flag_parens(tmp, PCF_NONE, CT_FPAREN_OPEN, pc->GetType(), false);
 
-            if (  tmp != nullptr
-               && tmp->IsNotNullChunk())
+            if (tmp->IsNotNullChunk())
             {
                if (tmp->Is(CT_BRACE_OPEN))
                {
@@ -1144,7 +1134,8 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
       && !is_oc_block(pc)
       && pc->GetParentType() != CT_OC_MSG_DECL
       && pc->GetParentType() != CT_OC_MSG_SPEC
-      && pc->IsString(")")
+      && (  pc->IsString(")")
+         || pc->Is(CT_FUNC_TYPE))
       && next->IsString("("))
    {
       if (language_is_set(LANG_D))
@@ -1538,12 +1529,15 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
 
    if (pc->Is(CT_AMP))
    {
+      Chunk *prevNext = prev->GetNext();
+
       if (prev->Is(CT_DELETE))
       {
          pc->SetType(CT_ADDR);
       }
       else if (  prev->Is(CT_TYPE)
-              || prev->Is(CT_QUALIFIER))
+              || prev->Is(CT_QUALIFIER)
+              || prevNext->Is(CT_QUALIFIER))
       {
          pc->SetType(CT_BYREF);
       }
@@ -1580,11 +1574,11 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
             prev->SetType(CT_TYPE);
          }
          else if (  pc->TestFlags(PCF_IN_PREPROC) // Issue #3559
+                 && prev->IsNot(CT_WORD)          // Issue #2205
                  && pc->Is(CT_AMP)
-                 && next->Is(CT_WORD))
+                 && next->Is(CT_WORD)
+                 && !pc->TestFlags(PCF_IN_SPAREN))
          {
-            //LOG_FMT(LGUY, " ++++++++++ pc->GetFlags(): ");
-            //log_pcf_flags(LGUY, pc->GetFlags());
             pc->SetType(CT_ADDR);
          }
          else
@@ -1592,7 +1586,7 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
             pc->SetType(CT_ARITH);
 
             if (  prev->Is(CT_WORD)
-               && !next->Is(CT_NUMBER)) // Issue #3407
+               && next->IsNot(CT_NUMBER))           // Issue #3407
             {
                Chunk *tmp = prev->GetPrevNcNnlNi(); // Issue #2279
 
@@ -1616,7 +1610,24 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
                   }
                   else if (tmp->Is(CT_DC_MEMBER))
                   {
-                     prev->SetType(CT_TYPE);
+                     // see also Issue #3967
+                     // Issue #2103 & Issue #3865: partial fix
+                     // No easy way to tell between an enum and a type with
+                     // a namespace qualifier. Compromise: if we're in a
+                     // function def or call, assume it's a ref.
+                     Chunk *nextNext = next->GetNext();
+
+                     if (  nextNext->IsNot(CT_DC_MEMBER)
+                        && (  pc->TestFlags(PCF_IN_FCN_CALL)
+                           || pc->TestFlags(PCF_IN_FCN_CTOR)
+                           || pc->TestFlags(PCF_IN_FCN_DEF)))
+                     {
+                        pc->SetType(CT_BYREF);
+                     }
+                     else
+                     {
+                        prev->SetType(CT_TYPE);
+                     }
                   }
                }
             }
@@ -1661,7 +1672,7 @@ void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
          // compare text with "C" to find extern "C" instructions
          if (pcPrev->Is(CT_STRING))
          {
-            if (unc_text::compare(pcPrev->Text(), "\"C\"") == 0)
+            if (UncText::compare(pcPrev->Text(), "\"C\"") == 0)
             {
                if (pcPrev->GetPrev()->Is(CT_EXTERN))
                {
@@ -1988,7 +1999,7 @@ void fix_symbols()
          pc = pc->GetNextNcNnl();
          continue;
       }
-      LOG_FMT(LFCNR, "%s(%d): pc orig line       is %zu, orig col is %zu, Text() is '%s', type is %s\n",
+      LOG_FMT(LFCNR, "%s(%d): pc orig line %zu, orig col %zu, text '%s', type %s\n",
               __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
       Chunk *prev = pc->GetPrevNcNnlNi(E_Scope::PREPROC);   // Issue #2279
 
@@ -1999,27 +2010,27 @@ void fix_symbols()
 
       if (prev->IsNullChunk())
       {
-         LOG_FMT(LFCNR, "%s(%d): WARNING: prev is NOT defined\n", __func__, __LINE__);
+         LOG_FMT(LFCNR, "%s(%d): prev is NOT defined\n", __func__, __LINE__);
       }
       else
       {
          // Issue #2279
-         LOG_FMT(LFCNR, "%s(%d): prev(ni) orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
+         LOG_FMT(LFCNR, "%s(%d): prev(ni) orig line %zu, orig col %zu, text '%s', type %s\n",
                  __func__, __LINE__, prev->GetOrigLine(), prev->GetOrigCol(), prev->Text(), get_token_name(prev->GetType()));
       }
       Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
 
       if (next->IsNullChunk())
       {
-         LOG_FMT(LFCNR, "%s(%d): WARNING: next is NOT defined\n", __func__, __LINE__);
+         LOG_FMT(LFCNR, "%s(%d): next is NOT defined\n", __func__, __LINE__);
       }
       else
       {
          // Issue #2279
-         LOG_FMT(LFCNR, "%s(%d): next orig line     is %zu, orig col is %zu, Text() is '%s', type is %s\n",
+         LOG_FMT(LFCNR, "%s(%d): next orig line %zu, orig col %zu, text '%s', type %s\n",
                  __func__, __LINE__, next->GetOrigLine(), next->GetOrigCol(), next->Text(), get_token_name(next->GetType()));
       }
-      LOG_FMT(LFCNR, "%s(%d): do_symbol_check(%s, %s, %s)\n",
+      LOG_FMT(LFCNR, "%s(%d): do_symbol_check for '%s, %s, %s'\n",
               __func__, __LINE__, prev->Text(), pc->Text(), next->Text());
       do_symbol_check(prev, pc, next);
       pc = pc->GetNextNcNnl();
@@ -2034,8 +2045,7 @@ void fix_symbols()
    pc = Chunk::GetHead();
    int square_level = -1;
 
-   while (  pc != nullptr
-         && pc->IsNotNullChunk())
+   while (pc->IsNotNullChunk())
    {
       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",
@@ -2078,6 +2088,7 @@ void fix_symbols()
                if (tmp->Is(CT_WORD))
                {
                   tmp->SetFlagBits(PCF_STMT_START | PCF_EXPR_START);
+                  log_ruleStart("start statement/ expression", tmp);
                   break;
                }
                tmp = tmp->GetNextNcNnl();
@@ -2093,6 +2104,7 @@ void fix_symbols()
          if (tmp->Is(CT_WORD))
          {
             tmp->SetFlagBits(PCF_STMT_START | PCF_EXPR_START);
+            log_ruleStart("start statement/ expression", tmp);
          }
       }
 
@@ -2125,6 +2137,7 @@ void fix_symbols()
                   )
                )
          && pc->GetParentType() != CT_BIT_COLON
+         && pc->GetParentType() != CT_ENUM_COLON      // Issue #4040
          && pc->GetParentType() != CT_ENUM
          && !pc->TestFlags(PCF_IN_CLASS_BASE)
          && !pc->TestFlags(PCF_IN_ENUM))
@@ -2340,7 +2353,7 @@ static Chunk *process_return_or_throw(Chunk *pc)
       }
    }
 
-   if (semi)
+   if (semi->IsNotNullChunk())
    {
       // add the parenthesis
       chunk.SetType(CT_PAREN_OPEN);
@@ -2374,14 +2387,13 @@ static Chunk *process_return_or_throw(Chunk *pc)
 
 static bool is_oc_block(Chunk *pc)
 {
-   return(  pc != nullptr
-         && (  pc->GetParentType() == CT_OC_BLOCK_TYPE
-            || pc->GetParentType() == CT_OC_BLOCK_EXPR
-            || pc->GetParentType() == CT_OC_BLOCK_ARG
-            || pc->GetParentType() == CT_OC_BLOCK
-            || pc->Is(CT_OC_BLOCK_CARET)
-            || pc->GetNext()->Is(CT_OC_BLOCK_CARET)
-            || pc->GetPrev()->Is(CT_OC_BLOCK_CARET)));
+   return(  pc->GetParentType() == CT_OC_BLOCK_TYPE
+         || pc->GetParentType() == CT_OC_BLOCK_EXPR
+         || pc->GetParentType() == CT_OC_BLOCK_ARG
+         || pc->GetParentType() == CT_OC_BLOCK
+         || pc->Is(CT_OC_BLOCK_CARET)
+         || pc->GetNext()->Is(CT_OC_BLOCK_CARET)
+         || pc->GetPrev()->Is(CT_OC_BLOCK_CARET));
 }
 
 
@@ -2496,7 +2508,7 @@ static void handle_cpp_lambda(Chunk *sq_o)
 
    if (prev->IsNullChunk())
    {
-      LOG_FMT(LFCNR, "%s(%d): prev is nullptr\n", __func__, __LINE__);
+      LOG_FMT(LFCNR, "%s(%d): prev is null chunk\n", __func__, __LINE__);
    }
 
    if (  prev->IsNullChunk()
@@ -2706,7 +2718,7 @@ static void handle_d_template(Chunk *pc)
    ChunkStack cs;
    Chunk      *tmp = get_d_template_types(cs, po);
 
-   if (  tmp == nullptr
+   if (  tmp->IsNullChunk()
       || tmp->IsNot(CT_PAREN_CLOSE))
    {
       // TODO: log an error, expected ')'
@@ -2745,11 +2757,6 @@ static void handle_d_template(Chunk *pc)
 
 Chunk *skip_template_next(Chunk *ang_open)
 {
-   if (ang_open == nullptr)
-   {
-      return(Chunk::NullChunkPtr);
-   }
-
    if (ang_open->Is(CT_ANGLE_OPEN))
    {
       Chunk *pc = ang_open->GetNextType(CT_ANGLE_CLOSE, ang_open->GetLevel());
@@ -2796,8 +2803,7 @@ static void handle_oc_class(Chunk *pc)
    }
    tmp = pc;
 
-   while (  (tmp = tmp->GetNextNnl()) != nullptr
-         && tmp->IsNotNullChunk())
+   while ((tmp = tmp->GetNextNnl())->IsNotNullChunk())
    {
       LOG_FMT(LOCCLASS, "%s(%d):       orig line is %zu, [%s]\n",
               __func__, __LINE__, tmp->GetOrigLine(), tmp->Text());
@@ -2905,6 +2911,7 @@ static void handle_oc_class(Chunk *pc)
          {
             tmp->SetType(CT_OC_SCOPE);
             tmp->SetFlagBits(PCF_STMT_START);
+            log_ruleStart("start statement", tmp);
             hit_scope = true;
          }
       }
@@ -2938,10 +2945,6 @@ static void handle_oc_block_literal(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   if (pc == nullptr)
-   {
-      return; // let's be paranoid
-   }
    Chunk *prev = pc->GetPrevNcNnlNi();   // Issue #2279
    Chunk *next = pc->GetNextNcNnl();
 
@@ -3079,7 +3082,7 @@ static void handle_oc_block_type(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   if (pc == nullptr)
+   if (pc->IsNullChunk())
    {
       return;
    }
@@ -3160,7 +3163,7 @@ static void handle_oc_block_type(Chunk *pc)
 } // handle_oc_block_type
 
 
-static Chunk *handle_oc_md_type(Chunk *paren_open, E_Token ptype, T_PcfFlags flags, bool &did_it)
+static Chunk *handle_oc_md_type(Chunk *paren_open, E_Token ptype, PcfFlags flags, bool &did_it)
 {
    Chunk *paren_close;
 
@@ -3203,11 +3206,6 @@ static void handle_oc_message_decl(Chunk *pc)
    // Figure out if this is a spec or decl
    Chunk *tmp = pc;
 
-   if (tmp == nullptr)
-   {
-      tmp = Chunk::NullChunkPtr;
-   }
-
    while ((tmp = tmp->GetNext())->IsNotNullChunk())
    {
       if (tmp->GetLevel() < pc->GetLevel())
@@ -3223,7 +3221,7 @@ static void handle_oc_message_decl(Chunk *pc)
       }
    }
 
-   if (tmp == nullptr)
+   if (tmp->IsNullChunk())
    {
       return;
    }
@@ -3328,12 +3326,7 @@ static void handle_oc_message_send(Chunk *os)
 {
    LOG_FUNC_ENTRY();
 
-   Chunk *cs = Chunk::NullChunkPtr;
-
-   if (os != nullptr)
-   {
-      cs = os->GetNext();
-   }
+   Chunk *cs = os->GetNext();
 
    while (  cs->IsNotNullChunk()
          && cs->GetLevel() > os->GetLevel())
@@ -3356,12 +3349,7 @@ static void handle_oc_message_send(Chunk *os)
       tmp->SetParentType(CT_OC_MSG);
    }
    // expect a word first thing or [...]
-   tmp = Chunk::NullChunkPtr;
-
-   if (os != nullptr)
-   {
-      tmp = os->GetNextNcNnl();
-   }
+   tmp = os->GetNextNcNnl();
 
    if (  tmp->Is(CT_SQUARE_OPEN)
       || tmp->Is(CT_PAREN_OPEN)
@@ -3549,14 +3537,7 @@ static void handle_oc_message_send(Chunk *os)
 
 static void handle_oc_available(Chunk *os)
 {
-   if (os != nullptr)
-   {
-      os = os->GetNext();
-   }
-   else
-   {
-      os = Chunk::NullChunkPtr;
-   }
+   os = os->GetNext();
 
    while (os->IsNotNullChunk())
    {
@@ -3580,13 +3561,8 @@ static void handle_oc_property_decl(Chunk *os)
    {
       typedef std::vector<Chunk *> ChunkGroup;
 
-      Chunk *next = Chunk::NullChunkPtr;
-
-      if (os != nullptr)
-      {
-         next = os->GetNext();
-      }
-      Chunk                   *open_paren = nullptr;
+      Chunk                   *next       = os->GetNext();
+      Chunk                   *open_paren = Chunk::NullChunkPtr;
 
       std::vector<ChunkGroup> class_chunks;       // class
       std::vector<ChunkGroup> thread_chunks;      // atomic, nonatomic
@@ -3789,8 +3765,7 @@ static void handle_oc_property_decl(Chunk *os)
          }
 
          // Remove the extra comma's that we did not move
-         while (  curr_chunk != nullptr
-               && curr_chunk->IsNotNullChunk()
+         while (  curr_chunk->IsNotNullChunk()
                && curr_chunk->IsNot(CT_PAREN_CLOSE))
          {
             Chunk *rm_chunk = curr_chunk;
@@ -3799,12 +3774,7 @@ static void handle_oc_property_decl(Chunk *os)
          }
       }
    }
-   Chunk *tmp = Chunk::NullChunkPtr;
-
-   if (os != nullptr)
-   {
-      tmp = os->GetNextNcNnl();
-   }
+   Chunk *tmp = os->GetNextNcNnl();
 
    if (tmp->IsParenOpen())
    {
@@ -3818,10 +3788,6 @@ static void handle_cs_square_stmt(Chunk *os)
 {
    LOG_FUNC_ENTRY();
 
-   if (os == nullptr)
-   {
-      os = Chunk::NullChunkPtr;
-   }
    Chunk *cs = os->GetNext();
 
    while (  cs->IsNotNullChunk()
@@ -3855,6 +3821,7 @@ static void handle_cs_square_stmt(Chunk *os)
    if (tmp->IsNotNullChunk())
    {
       tmp->SetFlagBits(PCF_STMT_START | PCF_EXPR_START);
+      log_ruleStart("start statement/ expression", tmp);
    }
 } // handle_cs_square_stmt
 
@@ -3903,8 +3870,7 @@ static void handle_cs_property(Chunk *bro)
 
 static void handle_cs_array_type(Chunk *pc)
 {
-   if (  pc == nullptr
-      || pc->IsNullChunk())
+   if (pc->IsNullChunk())
    {
       return;
    }
@@ -3932,12 +3898,7 @@ static void handle_cs_array_type(Chunk *pc)
 static void handle_wrap(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
-   Chunk *opp = Chunk::NullChunkPtr;
-
-   if (pc != nullptr)
-   {
-      opp = pc->GetNext();
-   }
+   Chunk *opp  = pc->GetNext();
    Chunk *name = opp->GetNext();
    Chunk *clp  = name->GetNext();
 
@@ -3991,7 +3952,7 @@ static void handle_proto_wrap(Chunk *pc)
    if (  opp->IsNullChunk()
       || name->IsNullChunk()
       || tmp->IsNullChunk()
-      || clp == nullptr
+      || clp->IsNullChunk()
       || cma->IsNullChunk()
       || (  name->IsNot(CT_WORD)
          && name->IsNot(CT_TYPE))
@@ -4062,11 +4023,6 @@ static void handle_java_assert(Chunk *pc)
    bool  did_colon = false;
    Chunk *tmp      = pc;
 
-   if (tmp == nullptr)
-   {
-      tmp = Chunk::NullChunkPtr;
-   }
-
    while ((tmp = tmp->GetNext())->IsNotNullChunk())
    {
       if (tmp->GetLevel() == pc->GetLevel())
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/combine.h
index 5cab3494..a121449b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/combine.h
@@ -12,8 +12,6 @@
 #include "chunk.h"
 #include "uncrustify_types.h"
 
-void mark_question_colon();
-
 
 /**
  * Change CT_INCDEC_AFTER + WORD to CT_INCDEC_BEFORE
@@ -70,8 +68,6 @@ Chunk *set_paren_parent(Chunk *start, E_Token parent);
  * First on all non-preprocessor chunks and then on each preprocessor chunk.
  * It does all the detection and classifying.
  * This is only called by fix_symbols.
- * The three parameters never get the value nullptr.
- * it is not necessary to test.
  */
 void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next);
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_fix_mark.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/combine_fix_mark.cpp
index ebaedce0..ff487e92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_fix_mark.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/combine_fix_mark.cpp
@@ -306,7 +306,7 @@ void fix_fcn_def_params(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
-   if (start == nullptr)
+   if (start->IsNullChunk())
    {
       return;
    }
@@ -395,7 +395,7 @@ void fix_type_cast(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
-   if (start == nullptr)
+   if (start->IsNullChunk())
    {
       return;
    }
@@ -437,7 +437,7 @@ void fix_typedef(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
-   if (start == nullptr)
+   if (start->IsNullChunk())
    {
       return;
    }
@@ -562,8 +562,7 @@ void fix_typedef(Chunk *start)
       && after->IsNot(CT_STRUCT)
       && after->IsNot(CT_UNION))
    {
-      if (  the_type != nullptr
-         && the_type->IsNotNullChunk())
+      if (the_type->IsNotNullChunk())
       {
          // We have just a regular typedef
          LOG_FMT(LTYPEDEF, "%s(%d): regular typedef Text() %s, on orig line %zu\n",
@@ -612,8 +611,7 @@ void fix_typedef(Chunk *start)
       }
    }
 
-   if (  the_type != nullptr
-      && the_type->IsNotNullChunk())
+   if (the_type->IsNotNullChunk())
    {
       LOG_FMT(LTYPEDEF, "%s(%d): %s typedef Text() %s, on orig line %zu\n",
               __func__, __LINE__, get_token_name(after->GetType()), the_type->Text(),
@@ -700,7 +698,7 @@ Chunk *fix_variable_definition(Chunk *start)
    if (end->IsNullChunk())
    {
       LOG_FMT(LFVD, "%s(%d): end is null chunk\n", __func__, __LINE__);
-      return(nullptr);
+      return(Chunk::NullChunkPtr);
    }
    LOG_FMT(LFVD, "%s(%d): end->GetType() is %s\n", __func__, __LINE__, get_token_name(end->GetType()));
 
@@ -1017,8 +1015,7 @@ void mark_function_return_type(Chunk *fname, Chunk *start, E_Token parent_type)
    LOG_FUNC_ENTRY();
    Chunk *pc = start;
 
-   if (  pc != nullptr
-      && pc->IsNotNullChunk())
+   if (pc->IsNotNullChunk())
    {
       // Step backwards from pc and mark the parent of the return type
       LOG_FMT(LFCNR, "%s(%d): (backwards) return type for '%s' @ orig line is %zu, orig col is %zu\n",
@@ -1152,11 +1149,11 @@ void mark_function(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   if (pc == nullptr)
+   if (pc->IsNullChunk())
    {
       return;
    }
-   LOG_FMT(LFCN, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s'\n",
+   LOG_FMT(LFCN, "%s(%d): orig line is %zu, orig col is %zu, text '%s'\n",
            __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
    Chunk *prev = pc->GetPrevNcNnlNi();   // Issue #2279
    Chunk *next = pc->GetNextNppOrNcNnl();
@@ -1166,22 +1163,22 @@ void mark_function(Chunk *pc)
       return;
    }
    Chunk *tmp;
-   Chunk *semi = nullptr;
+   Chunk *semi = Chunk::NullChunkPtr;
    Chunk *paren_open;
    Chunk *paren_close;
 
    // Find out what is before the operator
    if (pc->GetParentType() == CT_OPERATOR)
    {
-      LOG_FMT(LFCN, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s",
+      LOG_FMT(LFCN, "%s(%d): orig line %zu, orig col %zu, text '%s",
               __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
-      log_pcf_flags(LGUY, pc->GetFlags());
+      log_pcf_flags(LFCN, pc->GetFlags());
       Chunk *pc_op = pc->GetPrevType(CT_OPERATOR, pc->GetLevel());
 
       if (  pc_op->IsNotNullChunk()
          && pc_op->TestFlags(PCF_EXPR_START))
       {
-         LOG_FMT(LFCN, "%s(%d): (4) SET TO CT_FUNC_CALL: orig line is %zu, orig col is %zu, Text() '%s'\n",
+         LOG_FMT(LFCN, "%s(%d): (4) SET TO CT_FUNC_CALL: orig line %zu, orig col %zu, text '%s'\n",
                  __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
          pc->SetType(CT_FUNC_CALL);
       }
@@ -1246,7 +1243,7 @@ void mark_function(Chunk *pc)
             }
          }
 
-         if (  tmp != nullptr
+         if (  tmp->IsNotNullChunk()
             && pc->IsNot(CT_FUNC_CALL))
          {
             // Mark the return type
@@ -1272,10 +1269,10 @@ void mark_function(Chunk *pc)
          return;
       }
    }
-   LOG_FMT(LFCN, "%s(%d): orig line is %zu, orig col is %zu, Text() is '%s, type is %s, parent type is %s\n",
+   LOG_FMT(LFCN, "%s(%d): orig line %zu, orig col %zu, text '%s', type %s, parent type %s\n",
            __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(),
            get_token_name(pc->GetType()), get_token_name(pc->GetParentType()));
-   LOG_FMT(LFCN, "   level is %zu, brace level is %zu, next->Text() '%s', next->GetType() is %s, next->GetLevel() is %zu\n",
+   LOG_FMT(LFCN, "   level %zu, brace level %zu, next->text '%s', next->type %s, next->level is %zu\n",
            pc->GetLevel(), pc->GetBraceLevel(),
            next->Text(), get_token_name(next->GetType()), next->GetLevel());
 
@@ -1286,7 +1283,7 @@ void mark_function(Chunk *pc)
               __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
       next = skip_template_next(next);
 
-      if (next == nullptr)
+      if (next->IsNullChunk())
       {
          return;
       }
@@ -1296,13 +1293,13 @@ void mark_function(Chunk *pc)
    // Skip over any template and attribute madness
    next = skip_template_next(next);
 
-   if (next == nullptr)
+   if (next->IsNullChunk())
    {
       return;
    }
    next = skip_attribute_next(next);
 
-   if (next == nullptr)
+   if (next->IsNullChunk())
    {
       return;
    }
@@ -1395,7 +1392,7 @@ void mark_function(Chunk *pc)
             LOG_FMT(LFCN, "%s(%d): orig line is %zu, orig col is %zu, function type, changing '%s' into a type\n",
                     __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
 
-            if (tmp2)
+            if (tmp2->IsNotNullChunk())
             {
                tmp2->SetType(CT_FUNC_TYPE);
             }
@@ -1444,16 +1441,11 @@ void mark_function(Chunk *pc)
    LOG_FMT(LFCN, "%s(%d): Check for C++ function def, Text() is '%s', orig line is %zu, orig col is %zu, type is %s\n",
            __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()));
 
-   if (  prev != nullptr
-      && prev->IsNotNullChunk())
+   if (prev->IsNotNullChunk())
    {
       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->GetOrigLine(), prev->GetOrigCol(), get_token_name(prev->GetType()));
    }
-   else
-   {
-      prev = Chunk::NullChunkPtr;
-   }
 
    // Check for C++ function def
    if (  pc->Is(CT_FUNC_CLASS_DEF)
@@ -1777,7 +1769,6 @@ void mark_function(Chunk *pc)
       }
 
       if (  isa_def
-         && prev != nullptr
          && prev->IsNotNullChunk()
          && (  (  prev->IsParenClose()
                && prev->GetParentType() != CT_D_CAST
@@ -1821,8 +1812,7 @@ void mark_function(Chunk *pc)
                  __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
          pc->SetType(CT_FUNC_DEF);
 
-         if (  prev == nullptr
-            || prev->IsNullChunk())
+         if (prev->IsNullChunk())
          {
             prev = Chunk::GetHead();
          }
@@ -1844,7 +1834,7 @@ void mark_function(Chunk *pc)
 
       tmp = flag_parens(next, PCF_IN_FCN_CALL, CT_FPAREN_OPEN, CT_FUNC_CALL, false);
 
-      if (  tmp != nullptr
+      if (  tmp->IsNotNullChunk()
          && tmp->Is(CT_BRACE_OPEN)
          && tmp->GetParentType() != CT_DOUBLE_BRACE)
       {
@@ -2014,8 +2004,7 @@ void mark_function(Chunk *pc)
       }
    }
 
-   if (  semi != nullptr
-      && semi->IsNotNullChunk())
+   if (semi->IsNotNullChunk())
    {
       semi->SetParentType(pc->GetType());
    }
@@ -2027,9 +2016,40 @@ void mark_function(Chunk *pc)
    }
    else
    {
+      // see also Issue #2103
+      Chunk *funtionName = paren_open->GetPrevNcNnl();                    // Issue #3967
+      Chunk *a           = funtionName->GetPrevNcNnl();
+
+      while (a->IsNotNullChunk())
+      {
+         LOG_FMT(LFCN, "%s(%d): orig line is %zu, orig col is %zu, Text() is '%s', type is %s, parent type is %s\n",
+                 __func__, __LINE__, a->GetOrigLine(), a->GetOrigCol(), a->Text(),
+                 get_token_name(a->GetType()), get_token_name(a->GetParentType()));
+         log_pcf_flags(LFCN, a->GetFlags());
+
+         if (  a->Is(CT_ARITH)
+            && (strcmp(a->Text(), "&") == 0))
+         {
+            a->SetType(CT_BYREF);
+         }
+
+         if (a->GetParentType() == CT_NONE)
+         {
+            a->SetParentType(CT_FUNC_DEF);
+         }
+         // if token has PCF_STMT_START set, exit the loop
+         PcfFlags f = a->GetFlags();
+         PcfFlags u = f & PCF_STMT_START;
+         bool     b = u != E_PcfFlag::PCF_NONE;
+
+         if (b)
+         {
+            break;
+         }
+         a = a->GetPrevNcNnl();
+      }
       flag_parens(paren_open, PCF_IN_FCN_DEF, CT_FPAREN_OPEN, pc->GetType(), false);
    }
-   //flag_parens(paren_open, PCF_IN_FCN_DEF, CT_FPAREN_OPEN, pc->GetType(), true);
 
    if (pc->Is(CT_FUNC_CTOR_VAR))
    {
@@ -2056,7 +2076,7 @@ void mark_function(Chunk *pc)
          || (pc->Is(CT_FUNC_PROTO))))
    {
       tmp = paren_close->GetNextNcNnl();
-      T_PcfFlags in_where_spec_flags = PCF_NONE;
+      PcfFlags in_where_spec_flags = PCF_NONE;
 
       while (  tmp->IsNotNullChunk()
             && tmp->IsNot(CT_BRACE_OPEN)
@@ -2109,13 +2129,13 @@ void mark_function(Chunk *pc)
 bool mark_function_type(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
-   LOG_FMT(LFTYPE, "%s(%d): type is %s, Text() '%s' @ orig line is %zu, orig col is %zu\n",
+   LOG_FMT(LFTYPE, "%s(%d): type %s, text '%s' @ orig line %zu, orig col %zu\n",
            __func__, __LINE__, get_token_name(pc->GetType()), pc->Text(),
            pc->GetOrigLine(), pc->GetOrigCol());
 
    size_t  star_count = 0;
    size_t  word_count = 0;
-   Chunk   *ptrcnk    = nullptr;
+   Chunk   *ptrcnk    = Chunk::NullChunkPtr;
    Chunk   *tmp;
    Chunk   *apo;
    Chunk   *apc;
@@ -2140,7 +2160,7 @@ bool mark_function_type(Chunk *pc)
       }
       else
       {
-         LOG_FMT(LFTYPE, "%s(%d): not a word: Text() '%s', type is %s, @ orig line is %zu:, orig col is %zu\n",
+         LOG_FMT(LFTYPE, "%s(%d): not a word: text '%s', type %s, @ orig line %zu:, orig col %zu\n",
                  __func__, __LINE__, varcnk->Text(), get_token_name(varcnk->GetType()),
                  varcnk->GetOrigLine(), varcnk->GetOrigCol());
          goto nogo_exit;
@@ -2184,14 +2204,21 @@ bool mark_function_type(Chunk *pc)
    while ((tmp = tmp->GetPrevNcNnlNi())->IsNotNullChunk()) // Issue #2279
    {
       tmp = tmp->GetPrevNbsb();
-
       LOG_FMT(LFTYPE, " -- type is %s, %s on orig line %zu, orig col is %zu",
               get_token_name(tmp->GetType()), tmp->Text(),
               tmp->GetOrigLine(), tmp->GetOrigCol());
 
-      if (  tmp->IsStar()
-         || tmp->Is(CT_PTR_TYPE)
-         || tmp->Is(CT_CARET))
+      if (tmp->IsSemicolon())
+      {
+         // Stop if we found previous statement. Make 'tmp' null to make sure
+         // chunk_ends_type() does not start from the previous statement
+         LOG_FMT(LFTYPE, " -- found semicolon (break)\n");
+         tmp = Chunk::NullChunkPtr;
+         break;
+      }
+      else if (  tmp->IsStar()
+              || tmp->Is(CT_PTR_TYPE)
+              || tmp->Is(CT_CARET))
       {
          star_count++;
          ptrcnk = tmp;
@@ -2243,7 +2270,7 @@ bool mark_function_type(Chunk *pc)
       goto nogo_exit;
    }
 
-   if (ptrcnk)
+   if (ptrcnk->IsNotNullChunk())
    {
       ptrcnk->SetType(CT_PTR_TYPE);
    }
@@ -2268,6 +2295,7 @@ bool mark_function_type(Chunk *pc)
    apc->SetType(CT_FPAREN_CLOSE);
    apc->SetParentType(pt);
    fix_fcn_def_params(apo);
+   flag_parens(apo, PCF_IN_FCN_DEF, CT_NONE, pt, false);
 
    if (aft->IsSemicolon())
    {
@@ -2319,7 +2347,7 @@ nogo_exit:
    {
       LOG_FMT(LFTYPE, "%s(%d): setting FUNC_CALL on orig line is %zu, orig col is %zu\n",
               __func__, __LINE__, tmp->GetOrigLine(), tmp->GetOrigCol());
-      flag_parens(tmp, PCF_NONE, CT_FPAREN_OPEN, CT_FUNC_CALL, false);
+      flag_parens(tmp, PCF_IN_FCN_DEF, CT_FPAREN_OPEN, CT_FUNC_CALL, false);
    }
    return(false);
 } // mark_function_type
@@ -2468,12 +2496,12 @@ Chunk *mark_variable_definition(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
-   if (start == nullptr)
+   if (start->IsNullChunk())
    {
-      return(nullptr);
+      return(Chunk::NullChunkPtr);
    }
-   Chunk      *pc   = start;
-   T_PcfFlags flags = PCF_VAR_1ST_DEF;
+   Chunk    *pc   = start;
+   PcfFlags flags = PCF_VAR_1ST_DEF;
 
    LOG_FMT(LVARDEF, "%s(%d): orig line %zu, orig col %zu, Text() '%s', type is %s\n",
            __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(),
@@ -2539,14 +2567,14 @@ void mark_variable_stack(ChunkStack &cs, log_sev_t sev)
    // throw out the last word and mark the rest
    Chunk *var_name = cs.Pop_Back();
 
-   if (  var_name != nullptr
+   if (  var_name->IsNotNullChunk()
       && var_name->GetPrev()->IsNotNullChunk()
       && var_name->GetPrev()->GetType() == CT_DC_MEMBER)
    {
       cs.Push_Back(var_name);
    }
 
-   if (var_name != nullptr)
+   if (var_name->IsNotNullChunk())
    {
       LOG_FMT(LFCNP, "%s(%d): parameter on orig line %zu, orig col %zu:\n",
               __func__, __LINE__, var_name->GetOrigLine(), var_name->GetOrigCol());
@@ -2554,7 +2582,7 @@ void mark_variable_stack(ChunkStack &cs, log_sev_t sev)
       size_t word_cnt = 0;
       Chunk  *word_type;
 
-      while ((word_type = cs.Pop_Back()) != nullptr)
+      while ((word_type = cs.Pop_Back())->IsNotNullChunk())
       {
          if (  word_type->Is(CT_WORD)
             || word_type->Is(CT_TYPE))
@@ -2587,7 +2615,7 @@ void mark_variable_stack(ChunkStack &cs, log_sev_t sev)
 } // mark_variable_stack
 
 
-T_PcfFlags mark_where_chunk(Chunk *pc, E_Token parent_type, T_PcfFlags flags)
+PcfFlags mark_where_chunk(Chunk *pc, E_Token parent_type, PcfFlags flags)
 {
    /* TODO: should have options to control spacing around the ':' as well as newline ability for the
     * constraint clauses (should it break up a 'where A : B where C : D' on the same line? wrap? etc.) */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_fix_mark.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/combine_fix_mark.h
index dd6d26fa..f61aa7fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_fix_mark.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/combine_fix_mark.h
@@ -190,7 +190,7 @@ void mark_variable_stack(ChunkStack &cs, log_sev_t sev);
  * TODO: add doc cmt
  *
  */
-T_PcfFlags mark_where_chunk(Chunk *pc, E_Token parent_type, T_PcfFlags flags);
+PcfFlags mark_where_chunk(Chunk *pc, E_Token parent_type, PcfFlags flags);
 
 
 #endif /* COMBINE_FIX_MARK_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_labels.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/combine_labels.cpp
index a49a1fd4..3a26839b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_labels.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/combine_labels.cpp
@@ -18,11 +18,6 @@ Chunk *chunk_get_next_local(Chunk *pc, E_Scope scope = E_Scope::ALL)
 {
    Chunk *tmp = pc;
 
-   if (tmp == nullptr)
-   {
-      tmp = Chunk::NullChunkPtr;
-   }
-
    do
    {
       tmp = tmp->GetNext(scope);
@@ -38,11 +33,6 @@ Chunk *chunk_get_prev_local(Chunk *pc, E_Scope scope = E_Scope::ALL)
 {
    Chunk *tmp = pc;
 
-   if (tmp == nullptr)
-   {
-      tmp = Chunk::NullChunkPtr;
-   }
-
    do
    {
       tmp = tmp->GetPrev(scope);
@@ -81,8 +71,7 @@ void combine_labels()
 
    // unlikely that the file will start with a label...
    // prev cur next
-   while (  next != nullptr
-         && next->IsNotNullChunk())
+   while (next->IsNotNullChunk())
    {
       if (next->Is(CT_NEWLINE))
       {
@@ -104,6 +93,15 @@ void combine_labels()
          LOG_FMT(LFCN, "%s(%d): next orig line is %zu, orig col is %zu, Text() '%s', type is %s\n",
                  __func__, __LINE__, next->GetOrigLine(), next->GetOrigCol(), next->Text(), get_token_name(next->GetType()));
       }
+      E_Token pt = next->GetParentType();                         // Issue #4042
+
+      if (  pt == CT_UNION
+         && next->Is(CT_BRACE_OPEN))
+      {
+         Chunk *close_brace = next->GetClosingParen();
+         next = close_brace->GetNextNc();
+         continue;
+      }
 
       if (  !next->TestFlags(PCF_IN_OC_MSG) // filter OC case of [self class] msg send
          && (  next->Is(CT_CLASS)
@@ -171,7 +169,7 @@ void combine_labels()
             && !cur->Is(CT_OC_MSG_NAME)
             && next->TestFlags(PCF_IN_CONDITIONAL))             // Issue #3558
          {
-            //log_pcf_flags(LGUY, next->GetFlags());
+            //log_pcf_flags(LFCN, next->GetFlags());
             next->SetType(CT_COND_COLON);
             cs.Pop_Back();
          }
@@ -217,7 +215,7 @@ void combine_labels()
                     __func__, __LINE__, next->Text(), next->GetOrigLine(), next->GetOrigCol());
             Chunk *nextprev = chunk_get_prev_local(next);   // Issue #2279
 
-            if (nextprev == nullptr)
+            if (nextprev->IsNullChunk())
             {
                return;
             }
@@ -277,7 +275,7 @@ void combine_labels()
                LOG_FMT(LFCN, "%s(%d): orig line is %zu, orig col is %zu, tmp '%s': ",
                        __func__, __LINE__, tmp->GetOrigLine(), tmp->GetOrigCol(),
                        (tmp->Is(CT_NEWLINE)) ? "<Newline>" : tmp->Text());
-               log_pcf_flags(LGUY, tmp->GetFlags());
+               log_pcf_flags(LFCN, tmp->GetFlags());
 
                if (next->TestFlags(PCF_IN_FCN_CALL))
                {
@@ -433,7 +431,15 @@ void combine_labels()
                              get_token_name(next->GetParentType()),
                              get_token_name(cur->GetParentType()),
                              next->GetLevel(), next->GetBraceLevel());
-                     exit(EX_SOFTWARE);
+
+                     if (language_is_set(LANG_OC))
+                     {
+                        // TO DO: what is to do? any expert?
+                     }
+                     else
+                     {
+                        exit(EX_SOFTWARE);
+                     }
                   }
                }
             }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_labels.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/combine_labels.h
index 5d5954b2..5d5954b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_labels.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/combine_labels.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_skip.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/combine_skip.cpp
index 878941ff..3360547c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_skip.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/combine_skip.cpp
@@ -54,11 +54,6 @@ static Chunk *skip_to_expression_edge(Chunk *pc, Chunk *(Chunk::*GetNextFn)(E_Sc
 {
    Chunk *prev = pc;
 
-   if (prev == nullptr)
-   {
-      prev = Chunk::NullChunkPtr;
-   }
-
    if (prev->IsNotNullChunk())
    {
       std::size_t level         = prev->GetLevel();
@@ -110,11 +105,6 @@ Chunk *skip_to_expression_start(Chunk *pc)
 
 Chunk *skip_to_next_statement(Chunk *pc)
 {
-   if (pc == nullptr)
-   {
-      pc = Chunk::NullChunkPtr;
-   }
-
    while (  pc->IsNotNullChunk()
          && !pc->IsSemicolon()
          && pc->IsNot(CT_BRACE_OPEN)
@@ -139,11 +129,6 @@ Chunk *skip_template_prev(Chunk *ang_close)
 
 Chunk *skip_tsquare_next(Chunk *ary_def)
 {
-   if (ary_def == nullptr)
-   {
-      return(Chunk::NullChunkPtr);
-   }
-
    if (  ary_def->Is(CT_SQUARE_OPEN)
       || ary_def->Is(CT_TSQUARE))
    {
@@ -179,11 +164,6 @@ Chunk *skip_attribute_next(Chunk *attr)
    {
       attr = next->GetNextNcNnl();
    }
-
-   if (attr == nullptr)
-   {
-      return(Chunk::NullChunkPtr);
-   }
    return(attr);
 }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_skip.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/combine_skip.h
index 8bd9134e..8bd9134e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_skip.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/combine_skip.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_tools.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/combine_tools.cpp
index 7adafe68..53818133 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_tools.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/combine_tools.cpp
@@ -23,12 +23,12 @@ bool can_be_full_param(Chunk *start, Chunk *end)
 
    int   word_count     = 0;
    int   type_count     = 0;
-   Chunk *pc            = nullptr;
-   Chunk *first_word    = nullptr;
+   Chunk *pc            = Chunk::NullChunkPtr;
+   Chunk *first_word    = Chunk::NullChunkPtr;
    bool  first_word_set = false;
 
    for (pc = start;
-        pc != nullptr && pc->IsNotNullChunk() && pc != end;
+        pc->IsNotNullChunk() && pc != end;
         pc = pc->GetNextNcNnl(E_Scope::PREPROC))
    {
       LOG_FMT(LFPARAM, "%s(%d): pc->Text() is '%s', type is %s\n",
@@ -273,15 +273,14 @@ bool can_be_full_param(Chunk *start, Chunk *end)
          // 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(%d): <== type is %s, Likely!\n",
-                 __func__, __LINE__, (pc == nullptr ? "nullptr" : get_token_name(pc->GetType())));
+                 __func__, __LINE__, (pc->IsNullChunk() ? "null chunk" : get_token_name(pc->GetType())));
          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
-      && first_word->IsNotNullChunk())
+   if (first_word->IsNotNullChunk())
    {
       LOG_FMT(LFPARAM, "%s(%d): first_word->Text() is '%s'\n",
               __func__, __LINE__, first_word->Text());
@@ -296,7 +295,7 @@ bool can_be_full_param(Chunk *start, Chunk *end)
    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->GetType())));
+           (pc->IsNullChunk() ? "null chunk" : get_token_name(pc->GetType())));
 
    if (ret)
    {
@@ -313,19 +312,17 @@ bool can_be_full_param(Chunk *start, Chunk *end)
 bool chunk_ends_type(Chunk *start)
 {
    LOG_FUNC_ENTRY();
+
+   if (start->TestFlags(PCF_IN_FCN_CTOR))
+   {
+      return(false);
+   }
    Chunk  *pc       = start;
    bool   ret       = false;
    size_t cnt       = 0;
    bool   last_expr = false;
    bool   last_lval = false;
 
-   bool   a = pc->TestFlags(PCF_IN_FCN_CTOR);
-
-   if (a)
-   {
-      return(false);
-   }
-
    for ( ; pc->IsNotNullChunk(); pc = pc->GetPrevNcNnlNi()) // Issue #2279
    {
       LOG_FMT(LFTYPE, "%s(%d): type is %s, Text() '%s', orig line %zu, orig col %zu\n   ",
@@ -412,16 +409,15 @@ bool chunkstack_match(ChunkStack &cs, Chunk *pc)
 } // chunkstack_match
 
 
-void flag_series(Chunk *start, Chunk *end, T_PcfFlags set_flags, T_PcfFlags clr_flags, E_Scope nav)
+void flag_series(Chunk *start, Chunk *end, PcfFlags set_flags, PcfFlags clr_flags, E_Scope nav)
 {
    LOG_FUNC_ENTRY();
 
-   while (  start != nullptr
-         && start->IsNotNullChunk()
+   while (  start->IsNotNullChunk()
          && start != end)
    {
       start->UpdateFlagBits(clr_flags, set_flags);
-      log_pcf_flags(LGUY, start->GetFlags());
+      log_pcf_flags(LFTYPE, start->GetFlags());
 
       start = start->GetNext(nav);
 
@@ -431,11 +427,10 @@ void flag_series(Chunk *start, Chunk *end, T_PcfFlags set_flags, T_PcfFlags clr_
       }
    }
 
-   if (  end != nullptr
-      && end->IsNotNullChunk())
+   if (end->IsNotNullChunk())
    {
       end->UpdateFlagBits(clr_flags, set_flags);
-      log_pcf_flags(LGUY, end->GetFlags());
+      log_pcf_flags(LFTYPE, end->GetFlags());
    }
 } // flag_series
 
@@ -445,11 +440,6 @@ size_t get_cpp_template_angle_nest_level(Chunk *pc)
    LOG_FUNC_ENTRY();
    int nestLevel = 0;
 
-   if (pc == nullptr)
-   {
-      pc = Chunk::NullChunkPtr;
-   }
-
    while (  pc->IsNotNullChunk()
          && pc->TestFlags(PCF_IN_TEMPLATE))
    {
@@ -500,8 +490,7 @@ Chunk *get_d_template_types(ChunkStack &cs, Chunk *open_paren)
 
 bool go_on(Chunk *pc, Chunk *start)
 {
-   if (  pc == nullptr
-      || pc->IsNullChunk()
+   if (  pc->IsNullChunk()
       || pc->GetLevel() != start->GetLevel())
    {
       return(false);
@@ -534,8 +523,7 @@ void make_type(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   if (  pc != nullptr
-      && pc->IsNotNullChunk())
+   if (pc->IsNotNullChunk())
    {
       if (pc->Is(CT_WORD))
       {
@@ -577,5 +565,5 @@ Chunk *set_paren_parent(Chunk *start, E_Token parent_type)
       return(end->GetNextNcNnl(E_Scope::PREPROC));
    }
    LOG_FMT(LFLPAREN, "%s(%d):\n", __func__, __LINE__);
-   return(nullptr);
+   return(Chunk::NullChunkPtr);
 } // set_paren_parent
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_tools.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/combine_tools.h
index e18fe92a..a2575bfc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/combine_tools.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/combine_tools.h
@@ -51,7 +51,7 @@ bool chunkstack_match(ChunkStack &cs, Chunk *pc);
 void fix_fcn_def_params(Chunk *pc);
 
 
-void flag_series(Chunk *start, Chunk *end, T_PcfFlags set_flags, T_PcfFlags clr_flags = {}, E_Scope nav = E_Scope::ALL);
+void flag_series(Chunk *start, Chunk *end, PcfFlags set_flags, PcfFlags clr_flags = {}, E_Scope nav = E_Scope::ALL);
 
 
 /*
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/compat.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/compat.h
index 32fce459..66d60a06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/compat.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/compat.h
@@ -1,6 +1,6 @@
 /**
  * @file compat.h
- * prototypes for compat_xxx.c
+ * prototypes for compat_xxx.cpp
  *
  * @author  Ben Gardner
  * @license GPL v2+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/compat_posix.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/compat_posix.cpp
index c77c7a89..c77c7a89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/compat_posix.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/compat_posix.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/compat_win32.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/compat_win32.cpp
index e1617876..ff79199d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/compat_win32.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/compat_win32.cpp
@@ -29,7 +29,7 @@ bool unc_getenv(const char *name, std::string &str)
    }
    buf = (char *)malloc(len);
 
-   if (buf)
+   if (buf != nullptr)
    {
       len = GetEnvironmentVariableA(name, buf, len);
    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/config.h.in b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/config.h.in
index 420de635..420de635 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/config.h.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/config.h.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/cs_top_is_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/cs_top_is_question.cpp
index b9b5b958..b9b5b958 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/cs_top_is_question.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/cs_top_is_question.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/cs_top_is_question.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/cs_top_is_question.h
index de6ace3e..de6ace3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/cs_top_is_question.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/cs_top_is_question.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/detect.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/detect.cpp
index ec718e81..2f0be40a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/detect.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/detect.cpp
@@ -40,9 +40,9 @@ public:
 
 void sp_votes::vote(Chunk *first, Chunk *second)
 {
-   if (  first == nullptr
+   if (  first->IsNullChunk()
       || first->IsNewline()
-      || second == nullptr
+      || second->IsNullChunk()
       || second->IsNewline())
    {
       return;
@@ -91,7 +91,7 @@ sp_votes::~sp_votes()
 }
 
 
-// generates "vote_sp_xxx" variable name from uncrustify option name "UO_xxx"
+// generates "vote_sp_xxx" variable name from uncrustify option name "options::xxx()"
 #define SP_VOTE_VAR(x)    sp_votes vote_ ## x(options::x)
 
 
@@ -110,6 +110,7 @@ static void detect_space_options()
    SP_VOTE_VAR(sp_before_ptr_star);
    SP_VOTE_VAR(sp_before_unnamed_ptr_star);
    SP_VOTE_VAR(sp_between_ptr_star);
+   SP_VOTE_VAR(sp_between_ptr_ref);
    SP_VOTE_VAR(sp_after_ptr_star);
    SP_VOTE_VAR(sp_after_byref);
    SP_VOTE_VAR(sp_before_byref);
@@ -261,6 +262,11 @@ static void detect_space_options()
          {
             vote_sp_before_unnamed_byref.vote(prev, pc);
          }
+
+         if (prev->Is(CT_PTR_TYPE))
+         {
+            vote_sp_between_ptr_ref.vote(prev, pc);
+         }
          else
          {
             vote_sp_before_byref.vote(prev, pc);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/detect.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/detect.h
index 77169322..203aad16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/detect.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/detect.h
@@ -1,6 +1,6 @@
 /**
  * @file detect.h
- * prototypes for detect.c
+ * prototypes for detect.cpp
  *
  * @author  Ben Gardner
  * @license GPL v2+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/enum_cleanup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/enum_cleanup.cpp
index d44d5799..f89f61c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/enum_cleanup.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/enum_cleanup.cpp
@@ -37,8 +37,7 @@ void enum_cleanup()
                  __func__, __LINE__, pc->GetOrigLine(), get_token_name(pc->GetType()));
          Chunk *prev = pc->GetPrevNcNnl();                           // Issue #3604
 
-         if (  prev != nullptr
-            && prev->IsNotNullChunk())
+         if (prev->IsNotNullChunk())
          {
             if (prev->Is(CT_COMMA))
             {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/enum_cleanup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/enum_cleanup.h
index f9c46dc2..f9c46dc2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/enum_cleanup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/enum_cleanup.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/enum_flags.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/enum_flags.h
index 4f4e33c5..4f4e33c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/enum_flags.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/enum_flags.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/error_types.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/error_types.h
index 4b162768..4b162768 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/error_types.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/error_types.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/flag_braced_init_list.cpp
index 66c128fa..66c128fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_braced_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/flag_braced_init_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_braced_init_list.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/flag_braced_init_list.h
index 75d19a79..75d19a79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_braced_init_list.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/flag_braced_init_list.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/flag_decltype.cpp
index 6950bc10..6950bc10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/flag_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_decltype.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/flag_decltype.h
index 293fcd02..293fcd02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_decltype.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/flag_decltype.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/flag_parens.cpp
index c435710a..44de133b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_parens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/flag_parens.cpp
@@ -10,7 +10,7 @@
 #include "uncrustify.h"
 
 
-Chunk *flag_parens(Chunk *po, T_PcfFlags flags, E_Token opentype, E_Token parent_type, bool parent_all)
+Chunk *flag_parens(Chunk *po, PcfFlags flags, E_Token opentype, E_Token parent_type, bool parent_all)
 {
    LOG_FUNC_ENTRY();
    Chunk *paren_close;
@@ -42,8 +42,9 @@ Chunk *flag_parens(Chunk *po, T_PcfFlags flags, E_Token opentype, E_Token parent
       {
          Chunk *pc;
 
+         //for (pc = po;
          for (pc = po->GetNext(E_Scope::PREPROC);
-              pc != nullptr && pc->IsNotNullChunk() && pc != after_paren_close;
+              pc->IsNotNullChunk() && pc != after_paren_close;
               pc = pc->GetNext(E_Scope::PREPROC))
          {
             pc->SetFlagBits(flags);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_parens.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/flag_parens.h
index 220eb127..b789a810 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/flag_parens.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/flag_parens.h
@@ -22,7 +22,7 @@
  *
  * @return The token after the close paren
  */
-Chunk *flag_parens(Chunk *po, T_PcfFlags flags, E_Token opentype, E_Token parenttype, bool parent_all);
+Chunk *flag_parens(Chunk *po, PcfFlags flags, E_Token opentype, E_Token parenttype, bool parent_all);
 
 
 #endif /* FLAG_PARENS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/indent.cpp
index b9f515ad..364a899e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/indent.cpp
@@ -10,12 +10,13 @@
 #include "indent.h"
 
 #include "align.h"
-#include "frame_list.h"
 #include "options.h"
 #include "options_for_QT.h"
+#include "parsing_frame_stack.h"
 #include "prototypes.h"
 #include "quick_align_again.h"
 #include "space.h"
+#include <cstdint>
 
 #ifdef WIN32
 #include <algorithm>                   // to get max
@@ -168,7 +169,7 @@ static void indent_comment(Chunk *pc, size_t col);
 static size_t token_indent(E_Token type);
 
 
-static size_t calc_indent_continue(const ParseFrame &frm, size_t pse_tos);
+static size_t calc_indent_continue(const ParsingFrame &frm, size_t pse_tos);
 
 /**
  * Get candidate chunk first on line to which OC blocks can be indented against.
@@ -193,7 +194,7 @@ static bool single_line_comment_indent_rule_applies(Chunk *start, bool forward);
  * returns true if semicolon on the same level ends any assign operations
  * false if next thing hit is not the end of an assign operation
  */
-static bool is_end_of_assignment(Chunk *pc, const ParseFrame &frm);
+static bool is_end_of_assignment(Chunk *pc, const ParsingFrame &frm);
 
 
 void indent_to_column(Chunk *pc, size_t column)
@@ -228,7 +229,7 @@ void align_to_column(Chunk *pc, size_t column)
 {
    LOG_FUNC_ENTRY();
 
-   if (  pc == nullptr
+   if (  pc->IsNullChunk()
       || column == pc->GetColumn())
    {
       return;
@@ -383,7 +384,7 @@ void reindent_line(Chunk *pc, size_t column)
          {
             LOG_FMT(LINDLINED, "'%s'", pc->Text());
          }
-         LOG_FMT(LINDLINED, " to %zu (orig %zu)\n", pc->GetColumn(), pc->GetOrigCol());
+         LOG_FMT(LINDLINED, " to %zu (orig %zu/%zu)\n", pc->GetColumn(), pc->GetOrigLine(), pc->GetOrigCol());
       }
    } while (  pc->IsNotNullChunk()
            && pc->GetNlCount() == 0);
@@ -447,21 +448,21 @@ static size_t get_indent_first_continue(Chunk *pc)
 }
 
 
-static size_t calc_indent_continue(const ParseFrame &frm, size_t pse_tos)
+static size_t calc_indent_continue(const ParsingFrame &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)
+      && frm.at(pse_tos).GetIndentContinue())
    {
-      return(frm.at(pse_tos).indent);
+      return(frm.at(pse_tos).GetIndent());
    }
-   return(frm.at(pse_tos).indent + abs(ic));
+   return(frm.at(pse_tos).GetIndent() + abs(ic));
 }
 
 
-static size_t calc_indent_continue(const ParseFrame &frm)
+static size_t calc_indent_continue(const ParsingFrame &frm)
 {
    return(calc_indent_continue(frm, frm.size() - 1));
 }
@@ -491,12 +492,7 @@ static Chunk *oc_msg_block_indent(Chunk *pc, bool from_brace,
                                   bool from_keyword)
 {
    LOG_FUNC_ENTRY();
-   Chunk *tmp = Chunk::NullChunkPtr;
-
-   if (pc != nullptr)
-   {
-      tmp = pc->GetPrevNc();
-   }
+   Chunk *tmp = pc->GetPrevNc();
 
    if (from_brace)
    {
@@ -587,10 +583,10 @@ static Chunk *oc_msg_block_indent(Chunk *pc, bool from_brace,
    } while (false)
 
 
-static void _log_indent(const char *func, const uint32_t line, const ParseFrame &frm)
+static void _log_indent(const char *func, const uint32_t line, const ParsingFrame &frm)
 {
    LOG_FMT(LINDLINE, "%s(%d): frm.pse_tos is %zu, ...indent is %zu\n",
-           func, line, frm.size() - 1, frm.top().indent);
+           func, line, frm.size() - 1, frm.top().GetIndent());
 }
 
 
@@ -599,10 +595,10 @@ static void _log_indent(const char *func, const uint32_t line, const ParseFrame
    } while (false)
 
 
-static void _log_prev_indent(const char *func, const uint32_t line, const ParseFrame &frm)
+static void _log_prev_indent(const char *func, const uint32_t line, const ParsingFrame &frm)
 {
    LOG_FMT(LINDLINE, "%s(%d): frm.pse_tos is %zu, prev....indent is %zu\n",
-           func, line, frm.size() - 1, frm.prev().indent);
+           func, line, frm.size() - 1, frm.prev().GetIndent());
 }
 
 
@@ -611,10 +607,10 @@ static void _log_prev_indent(const char *func, const uint32_t line, const ParseF
    } while (false)
 
 
-static void _log_indent_tmp(const char *func, const uint32_t line, const ParseFrame &frm)
+static void _log_indent_tmp(const char *func, const uint32_t line, const ParsingFrame &frm)
 {
    LOG_FMT(LINDLINE, "%s(%d): frm.pse_tos is %zu, ...indent_tmp is %zu\n",
-           func, line, frm.size() - 1, frm.top().indent_tmp);
+           func, line, frm.size() - 1, frm.top().GetIndentTmp());
 }
 
 
@@ -660,17 +656,59 @@ void indent_text()
    bool         in_func_def   = false;
 
 
-   std::vector<ParseFrame> frames;
-   ParseFrame              frm{};
+   ParsingFrameStack frames;
+   ParsingFrame      frm;
 
 
    Chunk *pc        = Chunk::GetHead();
    bool  classFound = false;                                 // Issue #672
 
-   while (  pc != nullptr
-         && pc->IsNotNullChunk())
+   while (pc->IsNotNullChunk())
    {
       LOG_CHUNK(LINDLINE, pc);
+
+      // Mark continuation lines if absolute indentation is requested
+      if (  options::indent_continue() < 0
+         && (  pc->Is(CT_PAREN_OPEN)
+            || pc->Is(CT_LPAREN_OPEN)
+            || pc->Is(CT_SPAREN_OPEN)
+            || pc->Is(CT_FPAREN_OPEN)
+            || pc->Is(CT_RPAREN_OPEN)
+            || pc->Is(CT_SQUARE_OPEN)
+            || pc->Is(CT_ANGLE_OPEN)))
+      {
+         Chunk *next = pc->GetNext();
+
+         if (next->IsNewline())
+         {
+            while (next->IsNewline())
+            {
+               next = next->GetNext();
+            }
+
+            if (  next->IsNotNullChunk()
+               && !next->IsPreproc())
+            {
+               // Mark chunk as continuation line, so indentation can be
+               // correctly set over multiple passes
+               next->SetFlagBits(PCF_CONT_LINE);
+
+               // Mark open and close parens as continuation line chunks.
+               // This will prevent an additional level and frame to be
+               // added to the current frame stack (issue 3105).
+               LOG_FMT(LSPLIT, "%s(%d): set PCF_LINE_CONT for pc text '%s', orig line is %zu, orig col is %zu\n",
+                       __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
+
+               pc->SetFlagBits(PCF_CONT_LINE);
+               Chunk *closing_paren = pc->GetClosingParen();
+
+               if (closing_paren->IsNotNullChunk())
+               {
+                  closing_paren->SetFlagBits(PCF_CONT_LINE);
+               }
+            }
+         }
+      }
       //  forces string literal to column-1 [Fix for 1246]
       log_rule_B("indent_col1_multi_string_literal");
 
@@ -737,9 +775,9 @@ void indent_text()
             {
                in_func_def = true;
                frm.push(pc, __func__, __LINE__);
-               frm.top().indent_tmp = 1;
-               frm.top().indent     = 1;
-               frm.top().indent_tab = 1;
+               frm.top().SetIndentTmp(1);
+               frm.top().SetIndent(1);
+               frm.top().SetIndentTab(1);
             }
          }
          else
@@ -762,9 +800,9 @@ void indent_text()
       if (!in_preproc)
       {
          while (  !frm.empty()
-               && frm.top().in_preproc)
+               && frm.top().GetInPreproc())
          {
-            const E_Token type = frm.top().type;
+            const E_Token type = frm.top().GetOpenToken();
             LOG_FMT(LINDLINE, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
                     __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
             frm.pop(__func__, __LINE__, pc);
@@ -774,7 +812,7 @@ void indent_text()
              * PP_REGION_INDENT entry is right below it
              */
             if (  type == CT_PP_ENDREGION
-               && frm.top().type == CT_PP_REGION_INDENT)
+               && frm.top().GetOpenToken() == CT_PP_REGION_INDENT)
             {
                LOG_FMT(LINDLINE, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
                        __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
@@ -785,7 +823,7 @@ void indent_text()
       else if (pc->Is(CT_PREPROC)) // #
       {
          // Close out PP_IF_INDENT before playing with the parse frames
-         if (  frm.top().type == CT_PP_IF_INDENT
+         if (  frm.top().GetOpenToken() == CT_PP_IF_INDENT
             && (  pc->GetParentType() == CT_PP_ENDIF
                || pc->GetParentType() == CT_PP_ELSE))
          {
@@ -793,8 +831,8 @@ void indent_text()
                     __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
             frm.pop(__func__, __LINE__, pc);
          }
-         ParseFrame frmbkup = frm;
-         fl_check(frames, frm, cpd.pp_level, pc);
+         ParsingFrame frmbkup = frm;
+         frames.check(frm, cpd.pp_level, pc);
 
          // Indent the body of a #region here
          log_rule_B("pp_region_indent_code");
@@ -814,27 +852,27 @@ void indent_text()
             next->SetType(CT_PP_REGION);
 
             // Indent one level
-            frm.top().indent = frm.prev().indent + indent_size;
+            frm.top().SetIndent(frm.prev().GetIndent() + indent_size);
             log_indent();
 
-            frm.top().indent_tab = frm.prev().indent_tab + indent_size;
-            frm.top().indent_tmp = frm.top().indent;
-            frm.top().in_preproc = false;
+            frm.top().SetIndentTab(frm.prev().GetIndentTab() + indent_size);
+            frm.top().SetIndentTmp(frm.top().GetIndent());
+            frm.top().SetInPreproc(false);
             log_indent_tmp();
          }
          // If option set, remove indent inside switch statement
          log_rule_B("indent_switch_pp");
 
-         if (  frm.top().type == CT_CASE
+         if (  frm.top().GetOpenToken() == CT_CASE
             && !options::indent_switch_pp())
          {
             frm.push(pc, __func__, __LINE__);
             LOG_FMT(LINDPC, "%s(%d): frm.top().indent is %zu, indent_size is %zu\n",
-                    __func__, __LINE__, frm.top().indent, indent_size);
+                    __func__, __LINE__, frm.top().GetIndent(), indent_size);
 
-            if (frm.top().indent >= indent_size)
+            if (frm.top().GetIndent() >= indent_size)
             {
-               frm.prev().indent = frm.top().indent - indent_size;
+               frm.prev().SetIndent(frm.top().GetIndent() - indent_size);
             }
             log_prev_indent();
          }
@@ -904,7 +942,7 @@ void indent_text()
                if (should_ignore_preproc)
                {
                   // Preserve original indentation
-                  frm.top().indent = pc->GetNextNl()->GetNext()->GetOrigCol();
+                  frm.top().SetIndent(pc->GetNextNl()->GetNext()->GetOrigCol());
                   log_indent();
                }
                else
@@ -914,13 +952,13 @@ void indent_text()
                                  && ifdef_over_whole_file())
                                  ? 0 : indent_size;
 
-                  frm.top().indent = frm.prev().indent + extra;
+                  frm.top().SetIndent(frm.prev().GetIndent() + extra);
                   log_indent();
 
-                  frm.top().indent_tab = frm.prev().indent_tab + extra;
+                  frm.top().SetIndentTab(frm.prev().GetIndentTab() + extra);
                }
-               frm.top().indent_tmp = frm.top().indent;
-               frm.top().in_preproc = false;
+               frm.top().SetIndentTmp(frm.top().GetIndent());
+               frm.top().SetInPreproc(false);
                log_indent_tmp();
             }
          }
@@ -934,9 +972,9 @@ void indent_text()
             }
             else if (pc->GetParentType() == CT_PP_ELSE)
             {
-               if (  frm.top().type == CT_MEMBER
-                  && frm.top().pop_pc->IsNotNullChunk()
-                  && frm.top().pc != frmbkup.top().pc)
+               if (  frm.top().GetOpenToken() == CT_MEMBER
+                  && frm.top().GetPopChunk()->IsNotNullChunk()
+                  && frm.top().GetOpenChunk() != frmbkup.top().GetOpenChunk())
                {
                   Chunk *tmp = pc->GetNextNcNnlNpp();
 
@@ -960,17 +998,17 @@ void indent_text()
 
                      if (tmp->IsNotNullChunk())
                      {
-                        frm.top().pop_pc = tmp;
+                        frm.top().SetPopChunk(tmp);
                      }
                   }
                }
             }
             else if (pc->GetParentType() == CT_PP_ENDIF)
             {
-               if (  frmbkup.top().type == CT_MEMBER
-                  && frm.top().type == CT_MEMBER)
+               if (  frmbkup.top().GetOpenToken() == CT_MEMBER
+                  && frm.top().GetOpenToken() == CT_MEMBER)
                {
-                  frm.top().pop_pc = frmbkup.top().pop_pc;
+                  frm.top().SetPopChunk(frmbkup.top().GetPopChunk());
                }
             }
          }
@@ -987,22 +1025,22 @@ void indent_text()
             || pc->GetParentType() == CT_PP_UNDEF)
          {
             log_rule_B("pp_define_at_level");
-            frm.top().indent_tmp = options::pp_define_at_level()
-                                   ? frm.prev().indent_tmp : 1;
+            frm.top().SetIndentTmp(options::pp_define_at_level()
+                                   ? frm.prev().GetIndentTmp() : 1);
 
             log_rule_B("pp_multiline_define_body_indent");
 
             if (options::pp_multiline_define_body_indent() < 0)
             {
-               frm.top().indent = -options::pp_multiline_define_body_indent();
+               frm.top().SetIndent(-options::pp_multiline_define_body_indent());
             }
             else
             {
-               frm.top().indent = pc->GetColumn() + options::pp_multiline_define_body_indent();
+               frm.top().SetIndent(pc->GetColumn() + options::pp_multiline_define_body_indent());
             }
             log_indent();
 
-            frm.top().indent_tab = frm.top().indent;
+            frm.top().SetIndentTab(frm.top().GetIndent());
             log_indent_tmp();
          }
          else if (  (  pc->GetParentType() == CT_PP_PRAGMA
@@ -1010,36 +1048,36 @@ void indent_text()
                  && options::pp_define_at_level())
          {
             log_rule_B("pp_define_at_level");
-            frm.top().indent_tmp = frm.prev().indent_tmp;
-            frm.top().indent     = frm.top().indent_tmp + indent_size;
+            frm.top().SetIndentTmp(frm.prev().GetIndentTmp());
+            frm.top().SetIndent(frm.top().GetIndentTmp() + indent_size);
             log_indent();
 
-            frm.top().indent_tab = frm.top().indent;
+            frm.top().SetIndentTab(frm.top().GetIndent());
             log_indent_tmp();
          }
          else if (  pc->GetParentType() == CT_PP_INCLUDE
                  && options::pp_include_at_level())
          {
             log_rule_B("pp_include_at_level");
-            frm.top().indent_tmp = frm.prev().indent_tmp;
-            frm.top().indent     = frm.top().indent_tmp + indent_size;
+            frm.top().SetIndentTmp(frm.prev().GetIndentTmp());
+            frm.top().SetIndent(frm.top().GetIndentTmp() + indent_size);
             log_indent();
 
-            frm.top().indent_tab = frm.top().indent;
+            frm.top().SetIndentTab(frm.top().GetIndent());
             log_indent_tmp();
          }
          else
          {
-            if (  (frm.prev().type == CT_PP_REGION_INDENT)
-               || (  (frm.prev().type == CT_PP_IF_INDENT)
-                  && (frm.top().type != CT_PP_ENDIF)))
+            if (  (frm.prev().GetOpenToken() == CT_PP_REGION_INDENT)
+               || (  (frm.prev().GetOpenToken() == CT_PP_IF_INDENT)
+                  && (frm.top().GetOpenToken() != CT_PP_ENDIF)))
             {
-               frm.top().indent = frm.prev(2).indent;
+               frm.top().SetIndent(frm.prev(2).GetIndent());
                log_indent();
             }
             else
             {
-               frm.top().indent = frm.prev().indent;
+               frm.top().SetIndent(frm.prev().GetIndent());
                log_indent();
             }
             log_indent();
@@ -1065,13 +1103,13 @@ void indent_text()
 
             if (val != 0)
             {
-               size_t &indent = frm.top().indent;
-
+               size_t indent = frm.top().GetIndent();
                indent = (val > 0) ? val                     // reassign if positive val,
                         : ((size_t)(abs(val)) < indent)     // else if no underflow
                         ? (indent + val) : 0;               // reduce, else 0
+               frm.top().SetIndent(indent);
             }
-            frm.top().indent_tmp = frm.top().indent;
+            frm.top().SetIndentTmp(frm.top().GetIndent());
             log_indent_tmp();
          }
       }
@@ -1108,18 +1146,18 @@ void indent_text()
 
          // End anything that drops a level
          if (  !pc->IsCommentOrNewline()
-            && frm.top().level > pc->GetLevel())
+            && frm.top().GetOpenLevel() > pc->GetLevel())
          {
             LOG_FMT(LINDLINE, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
                     __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
             frm.pop(__func__, __LINE__, pc);
          }
 
-         if (frm.top().level >= pc->GetLevel())
+         if (frm.top().GetOpenLevel() >= pc->GetLevel())
          {
             // process virtual braces closes (no text output)
             if (  pc->Is(CT_VBRACE_CLOSE)
-               && frm.top().type == CT_VBRACE_OPEN)
+               && frm.top().GetOpenToken() == CT_VBRACE_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->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
@@ -1166,7 +1204,7 @@ void indent_text()
             log_rule_B("indent_inside_ternary_operator");
 
             if (  options::indent_inside_ternary_operator()
-               && (frm.top().type == CT_COND_COLON)
+               && (frm.top().GetOpenToken() == CT_COND_COLON)
                && (  pc->IsSemicolon()
                   || pc->Is(CT_COMMA)
                   || pc->Is(CT_OC_MSG_NAME)
@@ -1179,8 +1217,8 @@ void indent_text()
 
             // End any assign operations with a semicolon on the same level
             if (  pc->IsSemicolon()
-               && (  (frm.top().type == CT_IMPORT)
-                  || (frm.top().type == CT_USING)))
+               && (  (frm.top().GetOpenToken() == CT_IMPORT)
+                  || (frm.top().GetOpenToken() == CT_USING)))
             {
                LOG_FMT(LINDLINE, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
                        __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
@@ -1189,7 +1227,7 @@ void indent_text()
 
             // End any custom macro-based open/closes
             if (  !token_used
-               && (frm.top().type == CT_MACRO_OPEN)
+               && (frm.top().GetOpenToken() == CT_MACRO_OPEN)
                && pc->Is(CT_MACRO_CLOSE))
             {
                token_used = true;
@@ -1199,8 +1237,8 @@ void indent_text()
             }
 
             // End any CPP/ObjC class colon stuff
-            if (  (  (frm.top().type == CT_CLASS_COLON)
-                  || (frm.top().type == CT_CONSTR_COLON))
+            if (  (  (frm.top().GetOpenToken() == CT_CLASS_COLON)
+                  || (frm.top().GetOpenToken() == CT_CONSTR_COLON))
                && (  pc->Is(CT_BRACE_OPEN)
                   || pc->Is(CT_OC_END)
                   || pc->Is(CT_OC_SCOPE)
@@ -1219,7 +1257,7 @@ void indent_text()
             }
 
             // End ObjC class colon stuff inside of generic definition (like Test<T1: id<T3>>)
-            if (  (frm.top().type == CT_CLASS_COLON)
+            if (  (frm.top().GetOpenToken() == CT_CLASS_COLON)
                && pc->Is(CT_ANGLE_CLOSE)
                && pc->GetParentType() == CT_OC_GENERIC_SPEC)
             {
@@ -1233,7 +1271,7 @@ void indent_text()
             if (  language_is_set(LANG_OC)
                && pc->Is(CT_SQUARE_CLOSE)
                && pc->GetParentType() == CT_OC_AT
-               && frm.top().level >= pc->GetLevel())
+               && frm.top().GetOpenLevel() >= pc->GetLevel())
             {
                size_t count = 1;
                Chunk  *next = pc->GetNextNc();
@@ -1255,23 +1293,23 @@ void indent_text()
                {
                   while (count-- > 0)
                   {
-                     if (frm.top().type == CT_SQUARE_OPEN)
+                     if (frm.top().GetOpenToken() == CT_SQUARE_OPEN)
                      {
-                        if (frm.paren_count == 0)
+                        if (frm.GetParenCount() == 0)
                         {
-                           fprintf(stderr, "%s(%d): frm.paren_count is ZERO, cannot be decremented, at line %zu, column %zu\n",
+                           fprintf(stderr, "%s(%d): frame parenthesis count is ZERO, cannot be decremented, at line %zu, column %zu\n",
                                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
                            log_flush(true);
                            exit(EX_SOFTWARE);
                         }
-                        frm.paren_count--;
+                        frm.SetParenCount(frm.GetParenCount() - 1);
                      }
                      LOG_FMT(LINDLINE, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
                              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
                      frm.pop(__func__, __LINE__, pc);
                   }
 
-                  if (next)
+                  if (next->IsNotNullChunk())
                   {
                      // End any assign operations with a semicolon on the same level
                      if (is_end_of_assignment(next, frm))
@@ -1282,13 +1320,13 @@ void indent_text()
                      }
                   }
                   // Indent the brace to match outer most brace/square
-                  indent_column_set(frm.top().indent_tmp);
+                  indent_column_set(frm.top().GetIndentTmp());
                   continue;
                }
             }
 
             // a case is ended with another case or a close brace
-            if (  (frm.top().type == CT_CASE)
+            if (  (frm.top().GetOpenToken() == CT_CASE)
                && (  pc->Is(CT_BRACE_CLOSE)
                   || pc->Is(CT_CASE)))
             {
@@ -1297,24 +1335,24 @@ void indent_text()
                frm.pop(__func__, __LINE__, pc);
             }
 
-            if (frm.top().pop_pc->IsNotNullChunk())
+            if (frm.top().GetPopChunk()->IsNotNullChunk())
             {
                LOG_FMT(LINDLINE, "%s(%d): pop_pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
-                       __func__, __LINE__, frm.top().pop_pc->GetOrigLine(), frm.top().pop_pc->GetOrigCol(),
-                       frm.top().pop_pc->Text(), get_token_name(frm.top().pop_pc->GetType()));
+                       __func__, __LINE__, frm.top().GetPopChunk()->GetOrigLine(), frm.top().GetPopChunk()->GetOrigCol(),
+                       frm.top().GetPopChunk()->Text(), get_token_name(frm.top().GetPopChunk()->GetType()));
             }
-            LOG_FMT(LINDLINE, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
+            LOG_FMT(LINDLINE, "%s(%d):     pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
                     __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
 
-            if (  (frm.top().type == CT_MEMBER)
-               && frm.top().pop_pc == pc)
+            if (  (frm.top().GetOpenToken() == CT_MEMBER)
+               && frm.top().GetPopChunk() == pc)
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
+               LOG_FMT(LINDLINE, "%s(%d):     pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
                        __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
                frm.pop(__func__, __LINE__, pc);
             }
 
-            if (  (frm.top().type == CT_LAMBDA)
+            if (  (frm.top().GetOpenToken() == CT_LAMBDA)
                && (  pc->Is(CT_SEMICOLON)
                   || pc->Is(CT_COMMA)
                   || pc->Is(CT_BRACE_OPEN)))
@@ -1327,7 +1365,7 @@ void indent_text()
             log_rule_B("indent_access_spec_body");
 
             if (  options::indent_access_spec_body()
-               && (frm.top().type == CT_ACCESS)
+               && (frm.top().GetOpenToken() == CT_ACCESS)
                && (  pc->Is(CT_BRACE_CLOSE)
                   || pc->Is(CT_ACCESS)))
             {
@@ -1338,8 +1376,8 @@ void indent_text()
 
             // return & throw are ended with a semicolon
             if (  pc->IsSemicolon()
-               && (  (frm.top().type == CT_RETURN)
-                  || (frm.top().type == CT_THROW)))
+               && (  (frm.top().GetOpenToken() == CT_RETURN)
+                  || (frm.top().GetOpenToken() == CT_THROW)))
             {
                LOG_FMT(LINDLINE, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
                        __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
@@ -1347,7 +1385,7 @@ void indent_text()
             }
 
             // an OC SCOPE ('-' or '+') ends with a semicolon or brace open
-            if (  (frm.top().type == CT_OC_SCOPE)
+            if (  (frm.top().GetOpenToken() == CT_OC_SCOPE)
                && (  pc->IsSemicolon()
                   || pc->Is(CT_BRACE_OPEN)))
             {
@@ -1360,7 +1398,7 @@ void indent_text()
              * a typedef and an OC SCOPE ('-' or '+') ends with a semicolon or
              * brace open
              */
-            if (  (frm.top().type == CT_TYPEDEF)
+            if (  (frm.top().GetOpenToken() == CT_TYPEDEF)
                && (  pc->IsSemicolon()
                   || pc->IsParenOpen()
                   || pc->Is(CT_BRACE_OPEN)))
@@ -1371,7 +1409,7 @@ void indent_text()
             }
 
             // an SQL EXEC is ended with a semicolon
-            if (  (frm.top().type == CT_SQL_EXEC)
+            if (  (frm.top().GetOpenToken() == CT_SQL_EXEC)
                && pc->IsSemicolon())
             {
                LOG_FMT(LINDLINE, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
@@ -1380,7 +1418,7 @@ void indent_text()
             }
 
             // an CLASS is ended with a semicolon or brace open
-            if (  (frm.top().type == CT_CLASS)
+            if (  (frm.top().GetOpenToken() == CT_CLASS)
                && (  pc->Is(CT_CLASS_COLON)
                   || pc->Is(CT_BRACE_OPEN)
                   || pc->IsSemicolon()))
@@ -1393,8 +1431,8 @@ void indent_text()
 
             // Pop OC msg selector stack
             if (  options::indent_oc_inside_msg_sel()
-               && (frm.top().type != CT_SQUARE_OPEN)
-               && frm.top().level >= pc->GetLevel()
+               && (frm.top().GetOpenToken() != CT_SQUARE_OPEN)
+               && frm.top().GetOpenLevel() >= pc->GetLevel()
                && (  pc->Is(CT_OC_MSG_FUNC)
                   || pc->Is(CT_OC_MSG_NAME))) // Issue #2658
             {
@@ -1404,32 +1442,35 @@ void indent_text()
             }
 
             // Close out parenthesis and squares
-            if (  (frm.top().type == (pc->GetType() - 1))
+            if (  (frm.top().GetOpenToken() == (pc->GetType() - 1))
                && (  pc->Is(CT_PAREN_CLOSE)
                   || pc->Is(CT_LPAREN_CLOSE)                     // Issue #3054
                   || pc->Is(CT_SPAREN_CLOSE)
                   || pc->Is(CT_FPAREN_CLOSE)
+                  || pc->Is(CT_RPAREN_CLOSE)                     // Issue #3914
                   || pc->Is(CT_SQUARE_CLOSE)
-                  || pc->Is(CT_ANGLE_CLOSE)))
+                  || pc->Is(CT_ANGLE_CLOSE))
+               && (  !pc->TestFlags(PCF_CONT_LINE)
+                  || options::indent_continue() >= 0))
             {
                LOG_FMT(LINDLINE, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
                        __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
                frm.pop(__func__, __LINE__, pc);
 
-               if (frm.paren_count == 0)
+               if (frm.GetParenCount() == 0)
                {
-                  fprintf(stderr, "%s(%d): frm.paren_count is ZERO, cannot be decremented, at line %zu, column %zu\n",
+                  fprintf(stderr, "%s(%d): frame parenthesis count is ZERO, cannot be decremented, at line %zu, column %zu\n",
                           __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
                   log_flush(true);
                   exit(EX_SOFTWARE);
                }
-               frm.paren_count--;
+               frm.SetParenCount(frm.GetParenCount() - 1);
             }
          }
       } while (old_frm_size > frm.size());
 
       // Grab a copy of the current indent
-      indent_column_set(frm.top().indent_tmp);                        // Issue #3294
+      indent_column_set(frm.top().GetIndentTmp());                        // Issue #3294
       log_indent_tmp();
 
       log_rule_B("indent_single_newlines");
@@ -1449,20 +1490,20 @@ void indent_text()
 
          for (size_t ttidx = frm.size() - 1; ttidx > 0; ttidx--)
          {
-            LOG_FMT(LINDPC, "     [%zu %zu:%zu '%s' %s/%s tmp=%zu indent=%zu brace_indent=%zu indent_tab=%zu indent_cont=%d level=%zu pc brace level=%zu]\n",
+            LOG_FMT(LINDPC, "     [%zu %zu:%zu '%s' %s/%s tmp=%zu indent=%zu brace indent=%zu indent tab=%zu indent continue=%d level=%zu pc brace level=%zu]\n",
                     ttidx,
-                    frm.at(ttidx).pc->GetOrigLine(),
-                    frm.at(ttidx).pc->GetOrigCol(),
-                    frm.at(ttidx).pc->Text(),
-                    get_token_name(frm.at(ttidx).type),
-                    get_token_name(frm.at(ttidx).pc->GetParentType()),
-                    frm.at(ttidx).indent_tmp,
-                    frm.at(ttidx).indent,
-                    frm.at(ttidx).brace_indent,
-                    frm.at(ttidx).indent_tab,
-                    frm.at(ttidx).indent_cont,
-                    frm.at(ttidx).level,
-                    frm.at(ttidx).pc->GetBraceLevel());
+                    frm.at(ttidx).GetOpenChunk()->GetOrigLine(),
+                    frm.at(ttidx).GetOpenChunk()->GetOrigCol(),
+                    frm.at(ttidx).GetOpenChunk()->Text(),
+                    get_token_name(frm.at(ttidx).GetOpenToken()),
+                    get_token_name(frm.at(ttidx).GetOpenChunk()->GetParentType()),
+                    frm.at(ttidx).GetIndentTmp(),
+                    frm.at(ttidx).GetIndent(),
+                    frm.at(ttidx).GetBraceIndent(),
+                    frm.at(ttidx).GetIndentTab(),
+                    frm.at(ttidx).GetIndentContinue(),
+                    frm.at(ttidx).GetOpenLevel(),
+                    frm.at(ttidx).GetOpenChunk()->GetBraceLevel());
          }
       }
       char copy[1000];
@@ -1516,8 +1557,8 @@ void indent_text()
       {
          if (language_is_set(LANG_OC))
          {
-            if (  frm.top().type == CT_BRACE_OPEN
-               && frm.top().level >= pc->GetLevel())
+            if (  frm.top().GetOpenToken() == CT_BRACE_OPEN
+               && frm.top().GetOpenLevel() >= pc->GetLevel())
             {
                size_t count = 1;
                Chunk  *next = pc->GetNextNc();
@@ -1539,9 +1580,9 @@ void indent_text()
                   && pc->Is(CT_BRACE_CLOSE)
                   && pc->GetParentType() == CT_OC_AT)
                {
-                  if (frm.top().ip.ref)
+                  if (frm.top().GetIndentData().ref)
                   {
-                     pc->IndentData().ref   = frm.top().ip.ref;
+                     pc->IndentData().ref   = frm.top().GetIndentData().ref;
                      pc->IndentData().delta = 0;
                   }
 
@@ -1551,7 +1592,7 @@ void indent_text()
                      frm.pop(__func__, __LINE__, pc);
                   }
 
-                  if (next)
+                  if (next->IsNotNullChunk())
                   {
                      // End any assign operations with a semicolon on the same level
                      if (is_end_of_assignment(next, frm))
@@ -1562,23 +1603,23 @@ void indent_text()
                   }
 
                   // Indent the brace to match outer most brace/square
-                  if (frm.top().indent_cont)
+                  if (frm.top().GetIndentContinue())
                   {
-                     indent_column_set(frm.top().indent_tmp - indent_size);
+                     indent_column_set(frm.top().GetIndentTmp() - indent_size);
                   }
                   else
                   {
-                     indent_column_set(frm.top().indent_tmp);
+                     indent_column_set(frm.top().GetIndentTmp());
                   }
                }
                else
                {
                   // Indent the brace to match the open brace
-                  indent_column_set(frm.top().brace_indent);
+                  indent_column_set(frm.top().GetBraceIndent());
 
-                  if (frm.top().ip.ref)
+                  if (frm.top().GetIndentData().ref)
                   {
-                     pc->IndentData().ref   = frm.top().ip.ref;
+                     pc->IndentData().ref   = frm.top().GetIndentData().ref;
                      pc->IndentData().delta = 0;
                   }
                   LOG_FMT(LINDLINE, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
@@ -1587,14 +1628,14 @@ void indent_text()
                }
             }
          }
-         else if (frm.top().brace_indent) // Issue #3421
+         else if (frm.top().GetBraceIndent()) // Issue #3421
          {
             // Indent the brace to match the open brace
-            indent_column_set(frm.top().brace_indent);
+            indent_column_set(frm.top().GetBraceIndent());
 
-            if (frm.top().ip.ref)
+            if (frm.top().GetIndentData().ref)
             {
-               pc->IndentData().ref   = frm.top().ip.ref;
+               pc->IndentData().ref   = frm.top().GetIndentData().ref;
                pc->IndentData().delta = 0;
             }
             LOG_FMT(LINDLINE, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
@@ -1613,7 +1654,7 @@ void indent_text()
          {
             iMinIndent = indent_size;
          }
-         size_t iNewIndent = frm.prev().indent + iMinIndent;
+         size_t iNewIndent = frm.prev().GetIndent() + iMinIndent;
 
          log_rule_B("indent_vbrace_open_on_tabstop");
 
@@ -1621,14 +1662,14 @@ void indent_text()
          {
             iNewIndent = next_tab_column(iNewIndent);
          }
-         frm.top().indent = iNewIndent;
+         frm.top().SetIndent(iNewIndent);
          log_indent();
-         frm.top().indent_tmp = frm.top().indent;
-         frm.top().indent_tab = frm.top().indent;
+         frm.top().SetIndentTmp(frm.top().GetIndent());
+         frm.top().SetIndentTab(frm.top().GetIndent());
          log_indent_tmp();
 
          // Always indent on virtual braces
-         indent_column_set(frm.top().indent_tmp);
+         indent_column_set(frm.top().GetIndentTmp());
       }
       else if (  pc->Is(CT_BRACE_OPEN)
               && pc->GetNext()->IsNot(CT_NAMESPACE))
@@ -1640,8 +1681,8 @@ void indent_text()
          log_rule_B("indent_macro_brace");
 
          if (  !options::indent_macro_brace()
-            && frm.prev().type == CT_PP_DEFINE
-            && frm.prev().open_line == frm.top().open_line)
+            && frm.prev().GetOpenToken() == CT_PP_DEFINE
+            && frm.prev().GetOpenLine() == frm.top().GetOpenLine())
          {
             LOG_FMT(LINDENT2, "%s(%d): indent_macro_brace\n", __func__, __LINE__);
          }
@@ -1649,22 +1690,22 @@ void indent_text()
                  && pc->GetParentType() == CT_CPP_LAMBDA)
          {
             log_rule_B("indent_cpp_lambda_body");
-            frm.top().brace_indent = frm.prev().indent;
+            frm.top().SetBraceIndent(frm.prev().GetIndent());
 
-            Chunk *head     = frm.top().pc->GetPrevNcNnlNpp();
+            Chunk *head     = frm.top().GetOpenChunk()->GetPrevNcNnlNpp();
             Chunk *tail     = Chunk::NullChunkPtr;
-            Chunk *frm_prev = frm.prev().pc;
+            Chunk *frm_prev = frm.prev().GetOpenChunk();
             bool  enclosure = (  frm_prev->GetParentType() != CT_FUNC_DEF           // Issue #3407
                               && frm_prev != frm_prev->GetClosingParen());
             bool  linematch = true;
 
             for (auto it = frm.rbegin(); it != frm.rend() && tail->IsNullChunk(); ++it)
             {
-               if (it->pc && it->pc != frm.top().pc)
+               if (it->GetOpenChunk() != frm.top().GetOpenChunk())
                {
-                  linematch &= it->pc->IsOnSameLine(head);
+                  linematch &= it->GetOpenChunk()->IsOnSameLine(head);
                }
-               Chunk *match = it->pc->GetClosingParen();
+               Chunk *match = it->GetOpenChunk()->GetClosingParen();
 
                if (match->IsNullChunk())
                {
@@ -1695,12 +1736,12 @@ void indent_text()
 
             for (auto it = frm.rbegin(); it != frm.rend() && tail->IsNotNullChunk(); ++it)
             {
-               if (!it->pc->Is(CT_FPAREN_OPEN))
+               if (!it->GetOpenChunk()->Is(CT_FPAREN_OPEN))
                {
                   continue;
                }
 
-               if (it->pc->GetLevel() < tail->GetLevel())
+               if (it->GetOpenChunk()->GetLevel() < tail->GetLevel())
                {
                   toplevel = false;
                   break;
@@ -1712,42 +1753,44 @@ void indent_text()
             // 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, and indent_continue is non-zero
-            bool sameLine = frm.top().pc->GetClosingParen()->IsOnSameLine(tail);
+            bool sameLine = frm.top().GetOpenChunk()->GetClosingParen()->IsOnSameLine(tail);
 
             bool isAssignSameLine =
                !enclosure
                && options::align_assign_span() == 0
                && !options::indent_align_assign()
-               && frm.prev().pc->GetPrevNcNnlNpp()->IsOnSameLine(frm.prev().pc)
-               && frm.prev().pc->IsOnSameLine(frm.prev().pc->GetNextNcNnlNpp());
+               && frm.prev().GetOpenChunk()->GetPrevNcNnlNpp()->IsOnSameLine(frm.prev().GetOpenChunk())
+               && frm.prev().GetOpenChunk()->IsOnSameLine(frm.prev().GetOpenChunk()->GetNextNcNnlNpp());
 
             bool closureSameLineTopLevel =
                (options::indent_continue() > 0)
                && enclosure
                && linematch
                && toplevel
-               && frm.top().pc->GetClosingParen()->IsOnSameLine(frm.top().pc);
+               && frm.top().GetOpenChunk()->GetClosingParen()->IsOnSameLine(frm.top().GetOpenChunk());
 
-            if (sameLine && ((isAssignSameLine) || (closureSameLineTopLevel)))
+            if (  sameLine
+               && (  (isAssignSameLine)
+                  || (closureSameLineTopLevel)))
             {
-               if (indent_size > frm.top().brace_indent)       // if options::indent_indent_columns() is too big
+               if (indent_size > frm.top().GetBraceIndent())       // if options::indent_indent_columns() is too big
                {
-                  frm.top().brace_indent = 1;
+                  frm.top().SetBraceIndent(1);
                }
                else
                {
-                  frm.top().brace_indent -= indent_size;
+                  frm.top().SetBraceIndent(frm.top().GetBraceIndent() - indent_size);
                }
             }
-            indent_column_set(frm.top().brace_indent);
-            frm.top().indent = indent_column + indent_size;
+            indent_column_set(frm.top().GetBraceIndent());
+            frm.top().SetIndent(indent_column + indent_size);
             log_indent();
 
-            frm.top().indent_tab = frm.top().indent;
-            frm.top().indent_tmp = frm.top().indent;
+            frm.top().SetIndentTab(frm.top().GetIndent());
+            frm.top().SetIndentTmp(frm.top().GetIndent());
             log_indent_tmp();
 
-            frm.prev().indent_tmp = frm.top().indent_tmp;
+            frm.prev().SetIndentTmp(frm.top().GetIndentTmp());
             log_indent_tmp();
          }
          else if (  language_is_set(LANG_CPP)
@@ -1764,23 +1807,23 @@ void indent_text()
             {
                for (auto i = frm.rbegin(); i != frm.rend(); ++i)
                {
-                  if (i->ns_cnt)
+                  if (i->GetNsCount())
                   {
-                     namespace_indent_to_ignore = i->ns_cnt;
+                     namespace_indent_to_ignore = i->GetNsCount();
                      break;
                   }
                }
             }
             // Issue # 1296
-            frm.top().brace_indent = 1 + ((pc->GetBraceLevel() - namespace_indent_to_ignore) * indent_size);
-            indent_column_set(frm.top().brace_indent);
-            frm.top().indent = indent_column + indent_size;
+            frm.top().SetBraceIndent(1 + (pc->GetBraceLevel() - namespace_indent_to_ignore) * indent_size);
+            indent_column_set(frm.top().GetBraceIndent());
+            frm.top().SetIndent(indent_column + indent_size);
             log_indent();
-            frm.top().indent_tab = frm.top().indent;
-            frm.top().indent_tmp = frm.top().indent;
+            frm.top().SetIndentTab(frm.top().GetIndent());
+            frm.top().SetIndentTmp(frm.top().GetIndent());
             log_indent_tmp();
 
-            frm.prev().indent_tmp = frm.top().indent_tmp;
+            frm.prev().SetIndentTmp(frm.top().GetIndentTmp());
             log_indent_tmp();
          }
          else if (  language_is_set(LANG_CS | LANG_JAVA)
@@ -1789,15 +1832,15 @@ void indent_text()
                     || pc->GetParentType() == CT_DELEGATE))
          {
             log_rule_B("indent_cs_delegate_brace");
-            frm.top().brace_indent = 1 + ((pc->GetBraceLevel() + 1) * indent_size);
-            indent_column_set(frm.top().brace_indent);
-            frm.top().indent = indent_column + indent_size;
+            frm.top().SetBraceIndent(1 + (pc->GetBraceLevel() + 1) * indent_size);
+            indent_column_set(frm.top().GetBraceIndent());
+            frm.top().SetIndent(indent_column + indent_size);
             log_indent();
-            frm.top().indent_tab = frm.top().indent;
-            frm.top().indent_tmp = frm.top().indent;
+            frm.top().SetIndentTab(frm.top().GetIndent());
+            frm.top().SetIndentTmp(frm.top().GetIndent());
             log_indent_tmp();
 
-            frm.prev().indent_tmp = frm.top().indent_tmp;
+            frm.prev().SetIndentTmp(frm.top().GetIndentTmp());
             log_indent_tmp();
          }
          else if (  language_is_set(LANG_CS | LANG_JAVA)
@@ -1808,20 +1851,20 @@ void indent_text()
          {
             log_rule_B("indent_cs_delegate_brace");
             log_rule_B("indent_align_paren");
-            frm.top().brace_indent = frm.prev().indent;
+            frm.top().SetBraceIndent(frm.prev().GetIndent());
 
             // Issue # 1620, UNI-24090.cs
-            if (frm.prev().pc->IsOnSameLine(frm.top().pc->GetPrevNcNnlNpp()))
+            if (frm.prev().GetOpenChunk()->IsOnSameLine(frm.top().GetOpenChunk()->GetPrevNcNnlNpp()))
             {
-               frm.top().brace_indent -= indent_size;
+               frm.top().SetBraceIndent(frm.top().GetBraceIndent() - indent_size);
             }
-            indent_column_set(frm.top().brace_indent);
-            frm.top().indent = indent_column + indent_size;
+            indent_column_set(frm.top().GetBraceIndent());
+            frm.top().SetIndent(indent_column + indent_size);
             log_indent();
-            frm.top().indent_tab = frm.top().indent;
-            frm.top().indent_tmp = frm.top().indent;
+            frm.top().SetIndentTab(frm.top().GetIndent());
+            frm.top().SetIndentTmp(frm.top().GetIndent());
             log_indent_tmp();
-            frm.prev().indent_tmp = frm.top().indent_tmp;
+            frm.prev().SetIndentTmp(frm.top().GetIndentTmp());
             log_indent_tmp();
          }
          else if (  !options::indent_paren_open_brace()
@@ -1834,57 +1877,57 @@ void indent_text()
             log_rule_B("indent_paren_open_brace");
             // Issue #1165
             LOG_FMT(LINDENT2, "%s(%d): orig line is %zu, brace level is %zu, for '%s', pc->GetLevel() is %zu, pc(-1)->GetLevel() is %zu\n",
-                    __func__, __LINE__, pc->GetOrigLine(), pc->GetBraceLevel(), pc->Text(), pc->GetLevel(), frm.prev().pc->GetLevel());
-            frm.top().brace_indent = 1 + ((pc->GetBraceLevel() + 1) * indent_size);
-            indent_column_set(frm.top().brace_indent);
-            frm.top().indent = frm.prev().indent_tmp;
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetBraceLevel(), pc->Text(), pc->GetLevel(), frm.prev().GetOpenChunk()->GetLevel());
+            frm.top().SetBraceIndent(1 + (pc->GetBraceLevel() + 1) * indent_size);
+            indent_column_set(frm.top().GetBraceIndent());
+            frm.top().SetIndent(frm.prev().GetIndentTmp());
             log_indent();
 
-            frm.top().indent_tmp = frm.top().indent;
+            frm.top().SetIndentTmp(frm.top().GetIndent());
             log_indent_tmp();
          }
          // any '{' that is inside of a '(' overrides the '(' indent
          // only to help the vim command }
          else if (  !options::indent_paren_open_brace()
-                 && frm.prev().pc->IsParenOpen()
+                 && frm.prev().GetOpenChunk()->IsParenOpen()
                  && pc->GetNextNc()->IsNewline())
          {
             log_rule_B("indent_paren_open_brace");
             LOG_FMT(LINDENT2, "%s(%d): orig line is %zu, brace level is %zu, for '%s', pc->GetLevel() is %zu, pc(-1)->GetLevel() is %zu\n",
-                    __func__, __LINE__, pc->GetOrigLine(), pc->GetBraceLevel(), pc->Text(), pc->GetLevel(), frm.prev().pc->GetLevel());
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetBraceLevel(), pc->Text(), pc->GetLevel(), frm.prev().GetOpenChunk()->GetLevel());
             // FIXME: I don't know how much of this is necessary, but it seems to work
-            frm.top().brace_indent = 1 + (pc->GetBraceLevel() * indent_size);
-            indent_column_set(frm.top().brace_indent);
-            frm.top().indent = indent_column + indent_size;
+            frm.top().SetBraceIndent(1 + pc->GetBraceLevel() * indent_size);
+            indent_column_set(frm.top().GetBraceIndent());
+            frm.top().SetIndent(indent_column + indent_size);
             log_indent();
 
             if (  (pc->GetParentType() == CT_OC_BLOCK_EXPR)
                && pc->TestFlags(PCF_IN_OC_MSG))
             {
-               frm.top().indent = frm.prev().indent_tmp + indent_size;
+               frm.top().SetIndent(frm.prev().GetIndentTmp() + indent_size);
                log_indent();
-               frm.top().brace_indent = frm.prev().indent_tmp;
-               indent_column_set(frm.top().brace_indent);
+               frm.top().SetBraceIndent(frm.prev().GetIndentTmp());
+               indent_column_set(frm.top().GetBraceIndent());
             }
-            frm.top().indent_tab = frm.top().indent;
-            frm.top().indent_tmp = frm.top().indent;
+            frm.top().SetIndentTab(frm.top().GetIndent());
+            frm.top().SetIndentTmp(frm.top().GetIndent());
             log_indent_tmp();
 
-            frm.prev().indent_tmp = frm.top().indent_tmp;
+            frm.prev().SetIndentTmp(frm.top().GetIndentTmp());
          }
-         else if (  frm.paren_count != 0
+         else if (  frm.GetParenCount() != 0
                  && !pc->TestFlags(PCF_IN_LAMBDA)) // Issue #3761
          {
-            if (frm.top().pc->GetParentType() == CT_OC_BLOCK_EXPR)
+            if (frm.top().GetOpenChunk()->GetParentType() == CT_OC_BLOCK_EXPR)
             {
                log_rule_B("indent_oc_block_msg");
 
                if (  pc->TestFlags(PCF_IN_OC_MSG)
                   && options::indent_oc_block_msg())
                {
-                  frm.top().ip.ref = oc_msg_block_indent(pc, false, false, false, true);
+                  frm.top().IndentData().ref = oc_msg_block_indent(pc, false, false, false, true);
                   log_rule_B("indent_oc_block_msg");
-                  frm.top().ip.delta = options::indent_oc_block_msg();
+                  frm.top().IndentData().delta = options::indent_oc_block_msg();
                }
                log_rule_B("indent_oc_block");
                log_rule_B("indent_oc_block_msg_xcode_style");
@@ -1940,122 +1983,122 @@ void indent_text()
                                                    indent_from_colon,
                                                    indent_from_keyword);
 
-                  if (ref)
+                  if (ref->IsNotNullChunk())
                   {
-                     frm.top().indent = indent_size + ref->GetColumn();
+                     frm.top().SetIndent(indent_size + ref->GetColumn());
                   }
                   else
                   {
-                     frm.top().indent = 1 + ((pc->GetBraceLevel() + 1) * indent_size);
+                     frm.top().SetIndent(1 + ((pc->GetBraceLevel() + 1) * indent_size));
                   }
                   log_indent();
-                  indent_column_set(frm.top().indent - indent_size);
+                  indent_column_set(frm.top().GetIndent() - indent_size);
                }
                else
                {
-                  frm.top().indent = frm.prev().indent_tmp + indent_size;
+                  frm.top().SetIndent(frm.prev().GetIndentTmp() + indent_size);
                   log_indent();
                }
             }
-            else if (  frm.top().pc->GetType() == CT_BRACE_OPEN
-                    && frm.top().pc->GetParentType() == CT_OC_AT)
+            else if (  frm.top().GetOpenChunk()->GetType() == CT_BRACE_OPEN
+                    && frm.top().GetOpenChunk()->GetParentType() == CT_OC_AT)
             {
                // We are inside @{ ... } -- indent one tab from the paren
-               if (frm.prev().indent_cont)
+               if (frm.prev().GetIndentContinue())
                {
-                  frm.top().indent = frm.prev().indent_tmp;
+                  frm.top().SetIndent(frm.prev().GetIndentTmp());
                }
                else
                {
-                  frm.top().indent = frm.prev().indent_tmp + indent_size;
+                  frm.top().SetIndent(frm.prev().GetIndentTmp() + indent_size);
                }
                log_indent();
             }
             // Issue # 1620, UNI-24090.cs
-            else if (  frm.prev().pc->IsOnSameLine(frm.top().pc)
+            else if (  frm.prev().GetOpenChunk()->IsOnSameLine(frm.top().GetOpenChunk())
                     && !options::indent_align_paren()
-                    && frm.prev().pc->IsParenOpen()
+                    && frm.prev().GetOpenChunk()->IsParenOpen()
                     && !pc->TestFlags(PCF_ONE_LINER))
             {
                log_rule_B("indent_align_paren");
                // We are inside ({ ... }) -- where { and ( are on the same line, avoiding double indentations.
                // only to help the vim command }
-               frm.top().brace_indent = frm.prev().indent - indent_size;
-               indent_column_set(frm.top().brace_indent);
-               frm.top().indent = frm.prev().indent_tmp;
+               frm.top().SetBraceIndent(frm.prev().GetIndent() - indent_size);
+               indent_column_set(frm.top().GetBraceIndent());
+               frm.top().SetIndent(frm.prev().GetIndentTmp());
                log_indent();
             }
-            else if (  frm.prev().pc->IsOnSameLine(frm.top().pc->GetPrevNcNnlNpp())
+            else if (  frm.prev().GetOpenChunk()->IsOnSameLine(frm.top().GetOpenChunk()->GetPrevNcNnlNpp())
                     && !options::indent_align_paren()
-                    && frm.prev().pc->IsParenOpen()
+                    && frm.prev().GetOpenChunk()->IsParenOpen()
                     && !pc->TestFlags(PCF_ONE_LINER))
             {
                log_rule_B("indent_align_paren");
                // We are inside ({ ... }) -- where { and ( are on adjacent lines, avoiding indentation of brace.
                // only to help the vim command }
-               frm.top().brace_indent = frm.prev().indent - indent_size;
-               indent_column_set(frm.top().brace_indent);
-               frm.top().indent = frm.prev().indent_tmp;
+               frm.top().SetBraceIndent(frm.prev().GetIndent() - indent_size);
+               indent_column_set(frm.top().GetBraceIndent());
+               frm.top().SetIndent(frm.prev().GetIndentTmp());
                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().GetOpenToken() == CT_OC_MSG_FUNC
+                       || frm.prev().GetOpenToken() == CT_OC_MSG_NAME)) // Issue #2658
             {
                log_rule_B("indent_oc_inside_msg_sel");
                // [Class Message:{<here>
-               frm.top().indent = frm.prev().pc->GetColumn() + indent_size;
+               frm.top().SetIndent(frm.prev().GetOpenChunk()->GetColumn() + indent_size);
                log_indent();
-               indent_column_set(frm.prev().pc->GetColumn());
+               indent_column_set(frm.prev().GetOpenChunk()->GetColumn());
             }
             // Issue #3813
             else if (pc->TestFlags(PCF_OC_IN_BLOCK) && pc->GetParentType() == CT_SWITCH)
             {
-               frm.top().indent = frm.prev().indent_tmp;
+               frm.top().SetIndent(frm.prev().GetIndentTmp());
             }
             else
             {
                // We are inside ({ ... }) -- indent one tab from the paren
-               frm.top().indent = frm.prev().indent_tmp + indent_size;
+               frm.top().SetIndent(frm.prev().GetIndentTmp() + indent_size);
 
-               if (!frm.prev().pc->IsParenOpen())
+               if (!frm.prev().GetOpenChunk()->IsParenOpen())
                {
-                  frm.top().indent_tab = frm.top().indent;
+                  frm.top().SetIndentTab(frm.top().GetIndent());
                }
                log_indent();
             }
          }
-         else if (  frm.top().pc->GetType() == CT_BRACE_OPEN
-                 && frm.top().pc->GetParentType() == CT_OC_AT)
+         else if (  frm.top().GetOpenChunk()->GetType() == CT_BRACE_OPEN
+                 && frm.top().GetOpenChunk()->GetParentType() == CT_OC_AT)
          {
             // We are inside @{ ... } -- indent one tab from the paren
-            if (frm.prev().indent_cont)
+            if (frm.prev().GetIndentContinue())
             {
-               frm.top().indent = frm.prev().indent_tmp;
+               frm.top().SetIndent(frm.prev().GetIndentTmp());
             }
             else
             {
-               frm.top().indent     = frm.prev().indent_tmp + indent_size;
-               frm.top().indent_tab = frm.top().indent;
+               frm.top().SetIndent(frm.prev().GetIndentTmp() + indent_size);
+               frm.top().SetIndentTab(frm.top().GetIndent());
             }
             log_indent();
          }
          else if (  (  pc->GetParentType() == CT_BRACED_INIT_LIST
                     || (  !options::indent_compound_literal_return()
                        && pc->GetParentType() == CT_C_CAST))
-                 && frm.prev().type == CT_RETURN)
+                 && frm.prev().GetOpenToken() == CT_RETURN)
          {
             log_rule_B("indent_compound_literal_return");
 
             // we're returning either a c compound literal (CT_C_CAST) or a
             // C++11 initialization list (CT_BRACED_INIT_LIST), use indent from the return.
-            if (frm.prev().indent_cont)
+            if (frm.prev().GetIndentContinue())
             {
-               frm.top().indent = frm.prev().indent_tmp;
+               frm.top().SetIndent(frm.prev().GetIndentTmp());
             }
             else
             {
-               frm.top().indent = frm.prev().indent_tmp + indent_size;
+               frm.top().SetIndent(frm.prev().GetIndentTmp() + indent_size);
             }
             log_indent();
          }
@@ -2064,14 +2107,14 @@ void indent_text()
             // Use the prev indent level + indent_size.
             if (pc->GetParentType() == CT_SWITCH)
             {
-               frm.top().indent = frm.prev().indent + options::indent_switch_body();
+               frm.top().SetIndent(frm.prev().GetIndent() + options::indent_switch_body());
             }
             else
             {
-               frm.top().indent = frm.prev().indent + indent_size;
+               frm.top().SetIndent(frm.prev().GetIndent() + indent_size);
             }
             LOG_FMT(LINDLINE, "%s(%d): frm.pse_tos is %zu, ... indent is %zu\n",
-                    __func__, __LINE__, frm.size() - 1, frm.top().indent);
+                    __func__, __LINE__, frm.size() - 1, frm.top().GetIndent());
             LOG_FMT(LINDLINE, "%s(%d): orig line is %zu, orig col is %zu, Text() is '%s', parent type is %s\n",
                     __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(),
                     get_token_name(pc->GetParentType()));
@@ -2091,13 +2134,13 @@ void indent_text()
             {
                if (parent_token_indent != 0)
                {
-                  frm.top().indent += parent_token_indent - indent_size;
+                  frm.top().SetIndent(frm.top().GetIndent() + parent_token_indent - indent_size);
                   log_indent();
                }
                else
                {
                   log_rule_B("indent_brace");
-                  frm.top().indent += options::indent_brace();
+                  frm.top().SetIndent(frm.top().GetIndent() + options::indent_brace());
                   log_indent();
                   indent_column_set(indent_column + options::indent_brace());
                }
@@ -2112,12 +2155,12 @@ void indent_text()
                else
                {
                   log_rule_B("indent_case_brace");
-                  const auto tmp_indent = static_cast<int>(frm.prev().indent)
+                  const auto tmp_indent = static_cast<int>(frm.prev().GetIndent())
                                           - static_cast<int>(indent_size)
                                           + options::indent_case_brace();
                   /*
                    * An open brace with the parent of case does not indent by default
-                   * UO_indent_case_brace can be used to indent the brace.
+                   * options::indent_case_brace() can be used to indent the brace.
                    * So we need to take the CASE indent, subtract off the
                    * indent_size that was added above and then add indent_case_brace.
                    * may take negative value
@@ -2125,10 +2168,10 @@ void indent_text()
                   indent_column_set(max(tmp_indent, 0));
                }
                // Stuff inside the brace still needs to be indented
-               frm.top().indent = indent_column + indent_size;
+               frm.top().SetIndent(indent_column + indent_size);
                log_indent();
 
-               frm.top().indent_tmp = frm.top().indent;
+               frm.top().SetIndentTmp(frm.top().GetIndent());
                log_indent_tmp();
             }
             else if (  pc->GetParentType() == CT_CLASS
@@ -2137,12 +2180,12 @@ void indent_text()
                log_rule_B("indent_class");
                LOG_FMT(LINDENT, "%s(%d): orig line is %zu, orig col is %zu, text is %s\n",
                        __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
-               frm.top().indent -= indent_size;
+               frm.top().SetIndent(frm.top().GetIndent() - indent_size);
                log_indent();
             }
             else if (pc->GetParentType() == CT_NAMESPACE)
             {
-               frm.top().ns_cnt = frm.prev().ns_cnt + 1;
+               frm.top().SetNsCount(frm.prev().GetNsCount() + 1);
 
                log_rule_B("indent_namespace");
                log_rule_B("indent_namespace_single_indent");
@@ -2150,21 +2193,21 @@ void indent_text()
                if (  options::indent_namespace()
                   && options::indent_namespace_single_indent())
                {
-                  if (frm.top().ns_cnt >= 2)
+                  if (frm.top().GetNsCount() >= 2)
                   {
                      // undo indent on all except the first namespace
-                     frm.top().indent -= indent_size;
+                     frm.top().SetIndent(frm.top().GetIndent() - indent_size);
                      log_indent();
                   }
-                  indent_column_set(frm.prev(frm.top().ns_cnt).indent);
+                  indent_column_set(frm.prev(frm.top().GetNsCount()).GetIndent());
                }
                else if (  options::indent_namespace()
                        && options::indent_namespace_inner_only())
                {
-                  if (frm.top().ns_cnt == 1)
+                  if (frm.top().GetNsCount() == 1)
                   {
                      // undo indent on first namespace only
-                     frm.top().indent -= indent_size;
+                     frm.top().SetIndent(frm.top().GetIndent() - indent_size);
                      log_indent();
                   }
                }
@@ -2173,7 +2216,7 @@ void indent_text()
                {
                   log_rule_B("indent_namespace");
                   // don't indent long blocks
-                  frm.top().indent -= indent_size;
+                  frm.top().SetIndent(frm.top().GetIndent() - indent_size);
                   log_indent();
                }
                else // indenting 'short' namespace
@@ -2182,11 +2225,9 @@ void indent_text()
 
                   if (options::indent_namespace_level() > 0)
                   {
-                     frm.top().indent -= indent_size;
+                     frm.top().SetIndent(frm.top().GetIndent() - indent_size);
                      log_indent();
-
-                     frm.top().indent +=
-                        options::indent_namespace_level();
+                     frm.top().SetIndent(frm.top().GetIndent() + options::indent_namespace_level());
                      log_indent();
                   }
                }
@@ -2195,15 +2236,15 @@ void indent_text()
                     && !options::indent_extern())
             {
                log_rule_B("indent_extern");
-               frm.top().indent -= indent_size;
+               frm.top().SetIndent(frm.top().GetIndent() - indent_size);
                log_indent();
             }
-            frm.top().indent_tab = frm.top().indent;
+            frm.top().SetIndentTab(frm.top().GetIndent());
          }
 
          if (pc->TestFlags(PCF_DONT_INDENT))
          {
-            frm.top().indent = pc->GetColumn();
+            frm.top().SetIndent(pc->GetColumn());
             log_indent();
 
             indent_column_set(pc->GetColumn());
@@ -2229,8 +2270,8 @@ void indent_text()
                && prev->Is(CT_BRACE_OPEN)
                && prev->GetParentType() == CT_BRACED_INIT_LIST)
             {
-               indent_column = frm.prev().brace_indent;
-               frm.top().indent = frm.prev().indent;
+               indent_column = frm.prev().GetBraceIndent();
+               frm.top().SetIndent(frm.prev().GetIndent());
                log_indent();
             }
             else if (  !pc->IsNewlineBetween(next)
@@ -2239,11 +2280,11 @@ void indent_text()
                     && !pc->TestFlags(PCF_ONE_LINER)) // Issue #1108
             {
                log_rule_B("indent_token_after_brace");
-               frm.top().indent = next->GetColumn();
+               frm.top().SetIndent(next->GetColumn());
                log_indent();
             }
-            frm.top().indent_tmp = frm.top().indent;
-            frm.top().open_line  = pc->GetOrigLine();
+            frm.top().SetIndentTmp(frm.top().GetIndent());
+            frm.top().SetOpenLine(pc->GetOrigLine());
             log_indent_tmp();
 
             log_rule_B("Update the indent_column");
@@ -2252,21 +2293,21 @@ void indent_text()
             if (  brace_indent
                || parent_token_indent != 0)
             {
-               indent_column_set(frm.top().indent_tmp);
+               indent_column_set(frm.top().GetIndentTmp());
                log_indent_tmp();
             }
          }
          // Save the brace indent
-         frm.top().brace_indent = indent_column;
+         frm.top().SetBraceIndent(indent_column);
       }
       else if (pc->Is(CT_SQL_END))
       {
-         if (frm.top().type == CT_SQL_BEGIN)
+         if (frm.top().GetOpenToken() == CT_SQL_BEGIN)
          {
             LOG_FMT(LINDLINE, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
                     __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
             frm.pop(__func__, __LINE__, pc);
-            indent_column_set(frm.top().indent_tmp);
+            indent_column_set(frm.top().GetIndentTmp());
             log_indent_tmp();
          }
       }
@@ -2277,49 +2318,49 @@ void indent_text()
       {
          frm.push(pc, __func__, __LINE__);
 
-         frm.top().indent = frm.prev().indent + indent_size;
+         frm.top().SetIndent(frm.prev().GetIndent() + indent_size);
          log_indent();
 
-         frm.top().indent_tmp = frm.top().indent;
-         frm.top().indent_tab = frm.top().indent;
+         frm.top().SetIndentTmp(frm.top().GetIndent());
+         frm.top().SetIndentTab(frm.top().GetIndent());
          log_indent_tmp();
       }
       else if (pc->Is(CT_SQL_EXEC))
       {
          frm.push(pc, __func__, __LINE__);
 
-         frm.top().indent = frm.prev().indent + indent_size;
+         frm.top().SetIndent(frm.prev().GetIndent() + indent_size);
          log_indent();
 
-         frm.top().indent_tmp = frm.top().indent;
+         frm.top().SetIndentTmp(frm.top().GetIndent());
          log_indent_tmp();
       }
       else if (pc->Is(CT_MACRO_ELSE))
       {
-         if (frm.top().type == CT_MACRO_OPEN)
+         if (frm.top().GetOpenToken() == CT_MACRO_OPEN)
          {
-            indent_column_set(frm.prev().indent);
+            indent_column_set(frm.prev().GetIndent());
          }
       }
       else if (pc->Is(CT_CASE))
       {
-         // Start a case - indent UO_indent_switch_case from the switch level
+         // Start a case - indent options::indent_switch_case() from the switch level
          log_rule_B("indent_switch_case");
-         const size_t tmp = frm.top().indent + indent_size
+         const size_t tmp = frm.top().GetIndent() + indent_size
                             - options::indent_switch_body()
                             + options::indent_switch_case();
          frm.push(pc, __func__, __LINE__);
 
-         frm.top().indent = tmp;
+         frm.top().SetIndent(tmp);
          log_indent();
 
          log_rule_B("indent_case_shift");
-         frm.top().indent_tmp = tmp - indent_size + options::indent_case_shift();
-         frm.top().indent_tab = tmp;
+         frm.top().SetIndentTmp(tmp - indent_size + options::indent_case_shift());
+         frm.top().SetIndentTab(tmp);
          log_indent_tmp();
 
          // Always set on case statements
-         indent_column_set(frm.top().indent_tmp);
+         indent_column_set(frm.top().GetIndentTmp());
 
          if (options::indent_case_comment())
          {
@@ -2333,7 +2374,7 @@ void indent_text()
 
                if (t2->IsNewline())
                {
-                  pct->SetColumn(frm.top().indent_tmp);
+                  pct->SetColumn(frm.top().GetIndentTmp());
                   pct->SetColumnIndent(pct->GetColumn());
                }
             }
@@ -2367,7 +2408,7 @@ void indent_text()
          {
             log_rule_B("indent_label");
             const int val        = options::indent_label();
-            size_t    pse_indent = frm.top().indent;
+            size_t    pse_indent = frm.top().GetIndent();
 
             // Labels get sent to the left or backed up
             if (val > 0)
@@ -2397,21 +2438,21 @@ void indent_text()
 
          if (options::indent_access_spec_body())
          {
-            const size_t tmp = frm.top().indent + indent_size;
+            const size_t tmp = frm.top().GetIndent() + indent_size;
             frm.push(pc, __func__, __LINE__);
 
-            frm.top().indent = tmp;
+            frm.top().SetIndent(tmp);
             log_indent();
 
-            frm.top().indent_tmp = tmp - indent_size;
-            frm.top().indent_tab = tmp;
+            frm.top().SetIndentTmp(tmp - indent_size);
+            frm.top().SetIndentTab(tmp);
             log_indent_tmp();
 
             /*
              * If we are indenting the body, then we must leave the access spec
              * indented at brace level
              */
-            indent_column_set(frm.top().indent_tmp);
+            indent_column_set(frm.top().GetIndentTmp());
             // Issues 1161 + 2704
             // comments before 'access specifier' need to be aligned with the 'access specifier'
             // unless it is a Doxygen comment
@@ -2425,7 +2466,7 @@ void indent_text()
 
                if (t2->IsNewline())
                {
-                  pct->SetColumn(frm.top().indent_tmp);
+                  pct->SetColumn(frm.top().GetIndentTmp());
                   pct->SetColumnIndent(pct->GetColumn());
                }
             }
@@ -2442,7 +2483,7 @@ void indent_text()
             }
             else
             {
-               size_t pse_indent   = frm.top().indent;
+               size_t pse_indent   = frm.top().GetIndent();
                bool   no_underflow = (size_t)(abs(val)) < pse_indent;
 
                indent_column_set(no_underflow ? (pse_indent + val) : 0);
@@ -2455,11 +2496,11 @@ void indent_text()
          // just indent one level
          frm.push(pc, __func__, __LINE__);
 
-         frm.top().indent = frm.prev().indent_tmp + indent_size;
+         frm.top().SetIndent(frm.prev().GetIndentTmp() + indent_size);
          log_indent();
 
-         frm.top().indent_tmp = frm.top().indent;
-         frm.top().indent_tab = frm.top().indent;
+         frm.top().SetIndentTmp(frm.top().GetIndent());
+         frm.top().SetIndentTab(frm.top().GetIndent());
          log_indent_tmp();
 
          if (pc->Is(CT_CLASS_COLON))
@@ -2467,17 +2508,17 @@ void indent_text()
             if (options::indent_ignore_before_class_colon())
             {
                log_rule_B("indent_ignore_before_class_colon");
-               frm.top().indent_tmp = pc->GetOrigCol();
+               frm.top().SetIndentTmp(pc->GetOrigCol());
                log_indent_tmp();
             }
             else if (options::indent_before_class_colon() != 0)
             {
                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);
+               frm.top().SetIndentTmp(std::max<ptrdiff_t>(frm.top().GetIndentTmp() + options::indent_before_class_colon(), 0));
                log_indent_tmp();
             }
          }
-         indent_column_set(frm.top().indent_tmp);
+         indent_column_set(frm.top().GetIndentTmp());
 
          log_rule_B("indent_class_colon");
 
@@ -2488,7 +2529,7 @@ void indent_text()
 
             if (options::indent_class_on_colon())
             {
-               frm.top().indent = pc->GetColumn();
+               frm.top().SetIndent(pc->GetColumn());
                log_indent();
             }
             else
@@ -2498,7 +2539,7 @@ void indent_text()
                if (  next->IsNotNullChunk()
                   && !next->IsNewline())
                {
-                  frm.top().indent = next->GetColumn();
+                  frm.top().SetIndent(next->GetColumn());
                   log_indent();
                }
             }
@@ -2508,8 +2549,8 @@ void indent_text()
             if (options::indent_ignore_before_constr_colon())
             {
                log_rule_B("indent_ignore_before_constr_colon");
-               frm.top().indent_tmp = pc->GetOrigCol();
-               indent_column_set(frm.top().indent_tmp);
+               frm.top().SetIndentTmp(pc->GetOrigCol());
+               indent_column_set(frm.top().GetIndentTmp());
             }
 
             if (options::indent_constr_colon())
@@ -2520,7 +2561,7 @@ void indent_text()
                if (prev->IsNewline())
                {
                   log_rule_B("indent_ctor_init_following");
-                  frm.top().indent += options::indent_ctor_init_following();
+                  frm.top().SetIndent(frm.top().GetIndent() + options::indent_ctor_init_following());
                   log_indent();
                }
                // TODO: Create a dedicated indent_constr_on_colon?
@@ -2535,16 +2576,16 @@ void indent_text()
                    * a "negative" result would be always greater than zero.
                    * Using ptrdiff_t (a standard signed type of the same size as size_t) in order to avoid that.
                    */
-                  frm.top().indent = std::max<ptrdiff_t>(frm.top().indent + options::indent_ctor_init(), 0);
+                  frm.top().SetIndent(std::max<ptrdiff_t>(frm.top().GetIndent() + options::indent_ctor_init(), 0));
                   log_indent();
-                  frm.top().indent_tmp = std::max<ptrdiff_t>(frm.top().indent_tmp + options::indent_ctor_init(), 0);
-                  frm.top().indent_tab = std::max<ptrdiff_t>(frm.top().indent_tab + options::indent_ctor_init(), 0);
+                  frm.top().SetIndentTmp(std::max<ptrdiff_t>(frm.top().GetIndentTmp() + options::indent_ctor_init(), 0));
+                  frm.top().SetIndentTab(std::max<ptrdiff_t>(frm.top().GetIndentTab() + options::indent_ctor_init(), 0));
                   log_indent_tmp();
-                  indent_column_set(frm.top().indent_tmp);
+                  indent_column_set(frm.top().GetIndentTmp());
                }
                else if (options::indent_class_on_colon())
                {
-                  frm.top().indent = pc->GetColumn();
+                  frm.top().SetIndent(pc->GetColumn());
                   log_indent();
                }
                else
@@ -2554,7 +2595,7 @@ void indent_text()
                   if (  next->IsNotNullChunk()
                      && !next->IsNewline())
                   {
-                     frm.top().indent = next->GetColumn();
+                     frm.top().SetIndent(next->GetColumn());
                      log_indent();
                   }
                }
@@ -2593,12 +2634,15 @@ void indent_text()
 
          reindent_line(pc, indent_column);
       }
-      else if (  pc->Is(CT_PAREN_OPEN)
-              || pc->Is(CT_LPAREN_OPEN)                     // Issue #3054
-              || pc->Is(CT_SPAREN_OPEN)
-              || pc->Is(CT_FPAREN_OPEN)
-              || pc->Is(CT_SQUARE_OPEN)
-              || pc->Is(CT_ANGLE_OPEN))
+      else if (  (  pc->Is(CT_PAREN_OPEN)
+                 || pc->Is(CT_LPAREN_OPEN)                     // Issue #3054
+                 || pc->Is(CT_SPAREN_OPEN)
+                 || pc->Is(CT_FPAREN_OPEN)
+                 || pc->Is(CT_RPAREN_OPEN)                     // Issue #3914
+                 || pc->Is(CT_SQUARE_OPEN)
+                 || pc->Is(CT_ANGLE_OPEN))
+              && (  !pc->TestFlags(PCF_CONT_LINE)
+                 || options::indent_continue() >= 0))
       {
          /*
           * Open parenthesis and squares - never update indent_column,
@@ -2614,13 +2658,13 @@ void indent_text()
                     __func__, __LINE__, pc->GetOrigLine(), indent_column, pc->Text());
             reindent_line(pc, indent_column);
          }
-         frm.top().indent = pc->GetColumn() + pc->Len();
+         frm.top().SetIndent(pc->GetColumn() + pc->Len());
          log_indent();
 
          if (  pc->Is(CT_SQUARE_OPEN)
             && language_is_set(LANG_D))
          {
-            frm.top().indent_tab = frm.top().indent;
+            frm.top().SetIndentTab(frm.top().GetIndent());
          }
          bool skipped = false;
          log_rule_B("indent_inside_ternary_operator");
@@ -2630,14 +2674,14 @@ void indent_text()
             && (  pc->Is(CT_FPAREN_OPEN)
                || pc->Is(CT_PAREN_OPEN))
             && frm.size() > 2
-            && (  frm.prev().type == CT_QUESTION
-               || frm.prev().type == CT_COND_COLON)
+            && (  frm.prev().GetOpenToken() == CT_QUESTION
+               || frm.prev().GetOpenToken() == CT_COND_COLON)
             && !options::indent_align_paren())
          {
-            frm.top().indent = frm.prev().indent_tmp + indent_size;
+            frm.top().SetIndent(frm.prev().GetIndentTmp() + indent_size);
             log_indent();
-            frm.top().indent_tab = frm.top().indent;
-            frm.top().indent_tmp = frm.top().indent;
+            frm.top().SetIndentTab(frm.top().GetIndent());
+            frm.top().SetIndentTmp(frm.top().GetIndent());
             log_indent_tmp();
          }
          else if (  (  pc->Is(CT_FPAREN_OPEN)
@@ -2672,24 +2716,25 @@ void indent_text()
             size_t idx = (!frm.empty()) ? frm.size() - 2 : 0;
 
             while (  (  (  idx > 0
-                        && frm.at(idx).type != CT_BRACE_OPEN
-                        && frm.at(idx).type != CT_VBRACE_OPEN
-                        && frm.at(idx).type != CT_PAREN_OPEN
-                        && frm.at(idx).type != CT_FPAREN_OPEN
-                        && frm.at(idx).type != CT_SPAREN_OPEN
-                        && frm.at(idx).type != CT_SQUARE_OPEN
-                        && frm.at(idx).type != CT_ANGLE_OPEN
-                        && frm.at(idx).type != CT_CASE
-                        && frm.at(idx).type != CT_MEMBER
-                        && frm.at(idx).type != CT_QUESTION
-                        && frm.at(idx).type != CT_COND_COLON
-                        && frm.at(idx).type != CT_LAMBDA
-                        && frm.at(idx).type != CT_ASSIGN_NL)
-                     || frm.at(idx).pc->IsOnSameLine(frm.top().pc))
-                  && (  frm.at(idx).type != CT_CLASS_COLON
-                     && frm.at(idx).type != CT_CONSTR_COLON
-                     && !(  frm.at(idx).type == CT_LAMBDA
-                         && frm.at(idx).pc->GetPrevNc()->GetType() == CT_NEWLINE)))
+                        && frm.at(idx).GetOpenToken() != CT_BRACE_OPEN
+                        && frm.at(idx).GetOpenToken() != CT_VBRACE_OPEN
+                        && frm.at(idx).GetOpenToken() != CT_PAREN_OPEN
+                        && frm.at(idx).GetOpenToken() != CT_FPAREN_OPEN
+                        && frm.at(idx).GetOpenToken() != CT_RPAREN_OPEN                     // Issue #3914
+                        && frm.at(idx).GetOpenToken() != CT_SPAREN_OPEN
+                        && frm.at(idx).GetOpenToken() != CT_SQUARE_OPEN
+                        && frm.at(idx).GetOpenToken() != CT_ANGLE_OPEN
+                        && frm.at(idx).GetOpenToken() != CT_CASE
+                        && frm.at(idx).GetOpenToken() != CT_MEMBER
+                        && frm.at(idx).GetOpenToken() != CT_QUESTION
+                        && frm.at(idx).GetOpenToken() != CT_COND_COLON
+                        && frm.at(idx).GetOpenToken() != CT_LAMBDA
+                        && frm.at(idx).GetOpenToken() != CT_ASSIGN_NL)
+                     || frm.at(idx).GetOpenChunk()->IsOnSameLine(frm.top().GetOpenChunk()))
+                  && (  frm.at(idx).GetOpenToken() != CT_CLASS_COLON
+                     && frm.at(idx).GetOpenToken() != CT_CONSTR_COLON
+                     && !(  frm.at(idx).GetOpenToken() == CT_LAMBDA
+                         && frm.at(idx).GetOpenChunk()->GetPrevNc()->GetType() == CT_NEWLINE)))
             {
                if (idx == 0)
                {
@@ -2706,12 +2751,12 @@ void indent_text()
 
             if (options::indent_param() != 0)
             {
-               frm.top().indent = frm.at(idx).indent + options::indent_param();
+               frm.top().SetIndent(frm.at(idx).GetIndent() + options::indent_param());
                log_indent();
             }
             else
             {
-               frm.top().indent = frm.at(idx).indent + indent_size;
+               frm.top().SetIndent(frm.at(idx).GetIndent() + indent_size);
                log_indent();
             }
             log_rule_B("indent_func_param_double");
@@ -2719,26 +2764,26 @@ void indent_text()
             if (options::indent_func_param_double())
             {
                // double is: Use both values of the options indent_columns and indent_param
-               frm.top().indent += indent_size;
+               frm.top().SetIndent(frm.top().GetIndent() + indent_size);
                log_indent();
             }
-            frm.top().indent_tab = frm.top().indent;
+            frm.top().SetIndentTab(frm.top().GetIndent());
          }
          else if (  options::indent_oc_inside_msg_sel()
                  && pc->Is(CT_PAREN_OPEN)
                  && frm.size() > 2
-                 && (  frm.prev().type == CT_OC_MSG_FUNC
-                    || frm.prev().type == CT_OC_MSG_NAME)
+                 && (  frm.prev().GetOpenToken() == CT_OC_MSG_FUNC
+                    || frm.prev().GetOpenToken() == CT_OC_MSG_NAME)
                  && !options::indent_align_paren()) // Issue #2658
          {
             log_rule_B("indent_oc_inside_msg_sel");
             log_rule_B("indent_align_paren");
             // When parens are inside OC messages, push on the parse frame stack
             // [Class Message:(<here>
-            frm.top().indent = frm.prev().pc->GetColumn() + indent_size;
+            frm.top().SetIndent(frm.prev().GetOpenChunk()->GetColumn() + indent_size);
             log_indent();
-            frm.top().indent_tab = frm.top().indent;
-            frm.top().indent_tmp = frm.top().indent;
+            frm.top().SetIndentTab(frm.top().GetIndent());
+            frm.top().SetIndentTmp(frm.top().GetIndent());
             log_indent_tmp();
          }
          else if (  pc->Is(CT_PAREN_OPEN)
@@ -2750,15 +2795,15 @@ void indent_text()
             size_t idx = frm.size() - 2;
 
             while (  idx > 0
-                  && frm.at(idx).pc->IsOnSameLine(frm.top().pc))
+                  && frm.at(idx).GetOpenChunk()->IsOnSameLine(frm.top().GetOpenChunk()))
             {
                idx--;
                skipped = true;
             }
-            frm.top().indent = frm.at(idx).indent + indent_size;
+            frm.top().SetIndent(frm.at(idx).GetIndent() + indent_size);
             log_indent();
 
-            frm.top().indent_tab = frm.top().indent;
+            frm.top().SetIndentTab(frm.top().GetIndent());
             skipped = true;
          }
          else if (  (  pc->IsString("(")
@@ -2783,12 +2828,14 @@ void indent_text()
             if (  next->IsNewline()
                && !options::indent_paren_after_func_def()
                && !options::indent_paren_after_func_decl()
-               && !options::indent_paren_after_func_call())
+               && !options::indent_paren_after_func_call()
+               && (  !pc->TestFlags(PCF_CONT_LINE)
+                  || options::indent_continue() >= 0))
             {
                size_t sub = 2;
 
-               if (  (frm.prev().type == CT_ASSIGN)
-                  || (frm.prev().type == CT_RETURN))
+               if (  (frm.prev().GetOpenToken() == CT_ASSIGN)
+                  || (frm.prev().GetOpenToken() == CT_RETURN))
                {
                   sub = 3;
                }
@@ -2801,23 +2848,23 @@ void indent_text()
                   sub = frm.size() - 2;
 
                   while (  sub > 0
-                        && frm.at(sub).pc->IsOnSameLine(frm.top().pc))
+                        && frm.at(sub).GetOpenChunk()->IsOnSameLine(frm.top().GetOpenChunk()))
                   {
                      sub--;
                      skipped = true;
                   }
 
-                  if (  (  frm.at(sub + 1).type == CT_CLASS_COLON
-                        || frm.at(sub + 1).type == CT_CONSTR_COLON)
-                     && (frm.at(sub + 1).pc->GetPrev()->Is(CT_NEWLINE)))
+                  if (  (  frm.at(sub + 1).GetOpenToken() == CT_CLASS_COLON
+                        || frm.at(sub + 1).GetOpenToken() == CT_CONSTR_COLON)
+                     && (frm.at(sub + 1).GetOpenChunk()->GetPrev()->Is(CT_NEWLINE)))
                   {
                      sub = sub + 1;
                   }
                }
-               frm.top().indent = frm.at(sub).indent + indent_size;
+               frm.top().SetIndent(frm.at(sub).GetIndent() + indent_size);
                log_indent();
 
-               frm.top().indent_tab = frm.top().indent;
+               frm.top().SetIndentTab(frm.top().GetIndent());
                skipped = true;
             }
             else
@@ -2838,11 +2885,11 @@ void indent_text()
                   if (next->GetPrev()->IsComment())
                   {
                      // Issue #2099
-                     frm.top().indent = next->GetPrev()->GetColumn();
+                     frm.top().SetIndent(next->GetPrev()->GetColumn());
                   }
                   else
                   {
-                     frm.top().indent = next->GetColumn();
+                     frm.top().SetIndent(next->GetColumn());
                   }
                   log_indent();
                }
@@ -2853,7 +2900,7 @@ void indent_text()
          log_rule_B("indent_paren_after_func_def");
          log_rule_B("indent_paren_after_func_call");
 
-         if (  (  (  !frm.top().indent_cont                     // Issue #3567
+         if (  (  (  !frm.top().GetIndentContinue()             // Issue #3567
                   && vardefcol == 0)
                || (  !options::use_indent_continue_only_once()  // Issue #1160
                   && !options::indent_ignore_first_continue())) // Issue #3561
@@ -2870,10 +2917,10 @@ void indent_text()
                   && options::indent_paren_after_func_call())
                || !pc->GetNext()->IsNewline()))
          {
-            frm.top().indent = frm.prev().indent + indent_size;
+            frm.top().SetIndent(frm.prev().GetIndent() + indent_size);
             log_indent();
 
-            indent_column_set(frm.top().indent);
+            indent_column_set(frm.top().GetIndent());
          }
          log_rule_B("indent_continue");
 
@@ -2884,30 +2931,27 @@ void indent_text()
          {
             if (options::indent_ignore_first_continue())
             {
-               frm.top().indent = get_indent_first_continue(pc->GetNext());
+               frm.top().SetIndent(get_indent_first_continue(pc->GetNext()));
             }
             else
             {
-               frm.top().indent = frm.prev().indent;
+               frm.top().SetIndent(frm.prev().GetIndent());
             }
             log_indent();
 
             if (  pc->GetLevel() == pc->GetBraceLevel()
                && !options::indent_ignore_first_continue()
                && (  pc->Is(CT_FPAREN_OPEN)
+                  || pc->Is(CT_RPAREN_OPEN)                   // Issue #1170
                   || pc->Is(CT_SPAREN_OPEN)
                   || (  pc->Is(CT_SQUARE_OPEN)
                      && pc->GetParentType() != CT_OC_MSG)
-                  || pc->Is(CT_ANGLE_OPEN)))     // Issue #1170
+                  || pc->Is(CT_ANGLE_OPEN)))                  // Issue #1170
             {
-               //log_rule_B("indent_continue");
-               //frm.top().indent += abs(options::indent_continue());
-               //   frm.top().indent      = calc_indent_continue(frm);
-               //   frm.top().indent_cont = true;
                log_rule_B("use_indent_continue_only_once");
 
                if (  (options::use_indent_continue_only_once())
-                  && (frm.top().indent_cont)
+                  && (frm.top().GetIndentContinue())
                   && vardefcol != 0)
                {
                   /*
@@ -2926,30 +2970,30 @@ void indent_text()
                    */
 
                   // if vardefcol isn't zero, use it
-                  frm.top().indent = vardefcol;
+                  frm.top().SetIndent(vardefcol);
                   log_indent();
                }
                else
                {
-                  frm.top().indent = calc_indent_continue(frm);
+                  frm.top().SetIndent(calc_indent_continue(frm));
                   log_indent();
-                  frm.top().indent_cont = true;
+                  frm.top().SetIndentContinue(true);
 
                   log_rule_B("indent_sparen_extra");
 
                   if (  pc->Is(CT_SPAREN_OPEN)
                      && options::indent_sparen_extra() != 0)
                   {
-                     frm.top().indent += options::indent_sparen_extra();
+                     frm.top().SetIndent(frm.top().GetIndent() + options::indent_sparen_extra());
                      log_indent();
                   }
                }
             }
          }
-         frm.top().indent_tmp = frm.top().indent;
+         frm.top().SetIndentTmp(frm.top().GetIndent());
          log_indent_tmp();
 
-         frm.paren_count++;
+         frm.SetParenCount(frm.GetParenCount() + 1);
       }
       else if (  options::indent_member_single()
               && pc->Is(CT_MEMBER)
@@ -2958,21 +3002,21 @@ void indent_text()
       {
          log_rule_B("indent_member_single");
 
-         if (frm.top().type != CT_MEMBER)
+         if (frm.top().GetOpenToken() != CT_MEMBER)
          {
             frm.push(pc, __func__, __LINE__);
-            Chunk *tmp = frm.top().pc->GetPrevNcNnlNpp();
+            Chunk *tmp = frm.top().GetOpenChunk()->GetPrevNcNnlNpp();
 
-            if (frm.prev().pc->IsOnSameLine(tmp))
+            if (frm.prev().GetOpenChunk()->IsOnSameLine(tmp))
             {
-               frm.top().indent = frm.prev().indent;
+               frm.top().SetIndent(frm.prev().GetIndent());
             }
             else
             {
-               frm.top().indent = frm.prev().indent + indent_size;
+               frm.top().SetIndent(frm.prev().GetIndent() + indent_size);
             }
             log_indent();
-            frm.top().indent_tmp = frm.top().indent;
+            frm.top().SetIndentTmp(frm.top().GetIndent());
             log_indent_tmp();
          }
 
@@ -2986,7 +3030,7 @@ void indent_text()
             }
             else
             {
-               indent_column_set(frm.top().indent);
+               indent_column_set(frm.top().GetIndent());
                reindent_line(pc, indent_column);
                did_newline = false;
             }
@@ -3031,7 +3075,7 @@ void indent_text()
 
             if (tmp->IsNotNullChunk())
             {
-               frm.top().pop_pc = tmp;
+               frm.top().SetPopChunk(tmp);
             }
          }
       }
@@ -3048,20 +3092,20 @@ void indent_text()
          if (  pc->Is(CT_ASSIGN)
             && pc->GetPrev()->IsNewline())
          {
-            if (frm.top().type == CT_ASSIGN_NL)
+            if (frm.top().GetOpenToken() == CT_ASSIGN_NL)
             {
-               frm.top().indent_tmp = frm.top().indent;
+               frm.top().SetIndentTmp(frm.top().GetIndent());
             }
             else
             {
-               frm.top().indent_tmp = frm.top().indent + indent_size;
+               frm.top().SetIndentTmp(frm.top().GetIndent() + indent_size);
             }
             log_indent_tmp();
 
-            indent_column_set(frm.top().indent_tmp);
+            indent_column_set(frm.top().GetIndentTmp());
             LOG_FMT(LINDENT, "%s(%d): %zu] assign => %zu [%s]\n",
                     __func__, __LINE__, pc->GetOrigLine(), indent_column, pc->Text());
-            reindent_line(pc, frm.top().indent_tmp);
+            reindent_line(pc, frm.top().GetIndentTmp());
          }
          Chunk *next = pc->GetNext();
 
@@ -3073,7 +3117,7 @@ void indent_text()
              * assignments should be same and one more than this line's indent.
              * so popping the previous assign and pushing the new one
              */
-            if (  frm.top().type == CT_ASSIGN
+            if (  frm.top().GetOpenToken() == CT_ASSIGN
                && pc->Is(CT_ASSIGN))
             {
                LOG_FMT(LINDLINE, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
@@ -3085,19 +3129,19 @@ void indent_text()
             if (  pc->Is(CT_ASSIGN)
                && pc->GetPrev()->IsNewline())
             {
-               frm.top().type = CT_ASSIGN_NL;
+               frm.top().SetOpenToken(CT_ASSIGN_NL);
             }
             log_rule_B("indent_continue");
 
             if (options::indent_ignore_first_continue())
             {
-               frm.top().indent = get_indent_first_continue(pc);
+               frm.top().SetIndent(get_indent_first_continue(pc));
                log_indent();
-               frm.top().indent_cont = true; // Issue #3567
+               frm.top().SetIndentContinue(true); // Issue #3567
             }
             else if (options::indent_continue() != 0)
             {
-               frm.top().indent = frm.prev().indent;
+               frm.top().SetIndent(frm.prev().GetIndent());
                log_indent();
 
                if (  pc->GetLevel() == pc->GetBraceLevel()
@@ -3108,20 +3152,20 @@ void indent_text()
                   log_rule_B("use_indent_continue_only_once");
 
                   if (  (options::use_indent_continue_only_once())
-                     && (frm.top().indent_cont)
+                     && (frm.top().GetIndentContinue())
                      && vardefcol != 0)
                   {
                      // if vardefcol isn't zero, use it
-                     frm.top().indent = vardefcol;
+                     frm.top().SetIndent(vardefcol);
                      log_indent();
                   }
                   else
                   {
-                     frm.top().indent = calc_indent_continue(frm);
+                     frm.top().SetIndent(calc_indent_continue(frm));
                      log_indent();
 
-                     vardefcol = frm.top().indent;  // use the same variable for the next line
-                     frm.top().indent_cont = true;
+                     vardefcol = frm.top().GetIndent();  // use the same variable for the next line
+                     frm.top().SetIndentContinue(true);
                   }
                }
             }
@@ -3133,27 +3177,27 @@ void indent_text()
 
                if (options::indent_off_after_assign())             // Issue #2591
                {
-                  frm.top().indent = frm.prev().indent_tmp;
+                  frm.top().SetIndent(frm.prev().GetIndentTmp());
                }
                else
                {
-                  frm.top().indent = frm.prev().indent_tmp + indent_size;
+                  frm.top().SetIndent(frm.prev().GetIndentTmp() + indent_size);
                }
                log_indent();
 
                if (  pc->Is(CT_ASSIGN)
                   && next->IsNewline())
                {
-                  frm.top().type       = CT_ASSIGN_NL;
-                  frm.top().indent_tab = frm.top().indent;
+                  frm.top().SetOpenToken(CT_ASSIGN_NL);
+                  frm.top().SetIndentTab(frm.top().GetIndent());
                }
             }
             else
             {
-               frm.top().indent = pc->GetColumn() + pc->Len() + 1;
+               frm.top().SetIndent(pc->GetColumn() + pc->Len() + 1);
                log_indent();
             }
-            frm.top().indent_tmp = frm.top().indent;
+            frm.top().SetIndentTmp(frm.top().GetIndent());
             log_indent_tmp();
          }
       }
@@ -3190,15 +3234,15 @@ void indent_text()
                      && options::indent_single_after_return()))
                {
                   // apply normal single indentation
-                  frm.top().indent = frm.prev().indent + indent_size;
+                  frm.top().SetIndent(frm.prev().GetIndent() + indent_size);
                }
                else
                {
                   // indent after the return token
-                  frm.top().indent = frm.prev().indent + pc->Len() + 1;
+                  frm.top().SetIndent(frm.prev().GetIndent() + pc->Len() + 1);
                }
                log_indent();
-               frm.top().indent_tmp = frm.prev().indent;
+               frm.top().SetIndentTmp(frm.prev().GetIndent());
                log_indent_tmp();
             }
             log_indent();
@@ -3209,30 +3253,30 @@ void indent_text()
       {
          frm.push(pc, __func__, __LINE__);
          // Issue #405
-         frm.top().indent = frm.prev().indent;
+         frm.top().SetIndent(frm.prev().GetIndent());
          log_indent();
 
-         frm.top().indent_tmp = frm.top().indent;
+         frm.top().SetIndentTmp(frm.top().GetIndent());
          LOG_FMT(LINDLINE, "%s(%d): .indent is %zu, .indent_tmp is %zu\n",
-                 __func__, __LINE__, frm.top().indent, frm.top().indent_tmp);
+                 __func__, __LINE__, frm.top().GetIndent(), frm.top().GetIndentTmp());
 
          log_rule_B("indent_continue");
 
          if (options::indent_ignore_first_continue())
          {
-            frm.top().indent = get_indent_first_continue(pc);
+            frm.top().SetIndent(get_indent_first_continue(pc));
             log_indent();
          }
          else if (options::indent_continue() != 0)
          {
-            frm.top().indent = calc_indent_continue(frm, frm.size() - 2);
+            frm.top().SetIndent(calc_indent_continue(frm, frm.size() - 2));
             log_indent();
 
-            frm.top().indent_cont = true;
+            frm.top().SetIndentContinue(true);
          }
          else
          {
-            frm.top().indent = frm.prev().indent + indent_size;
+            frm.top().SetIndent(frm.prev().GetIndent() + indent_size);
             log_indent();
          }
       }
@@ -3247,9 +3291,9 @@ void indent_text()
          if (  pc->GetParentType() == CT_FUNC_DEF
             || pc->GetParentType() == CT_FUNC_PROTO
             || (  pc->GetParentType() == CT_STRUCT
-               && frm.top().type != CT_CLASS_COLON))
+               && frm.top().GetOpenToken() != CT_CLASS_COLON))
          {
-            indent_column_set(frm.top().indent + 4);
+            indent_column_set(frm.top().GetIndent() + 4);
          }
       }
       else if (  options::indent_inside_ternary_operator()
@@ -3260,7 +3304,7 @@ void indent_text()
 
          // Pop any colons before because they should already be processed
          while (  pc->Is(CT_COND_COLON)
-               && frm.top().type == CT_COND_COLON)
+               && frm.top().GetOpenToken() == CT_COND_COLON)
          {
             frm.pop(__func__, __LINE__, pc);
          }
@@ -3269,19 +3313,19 @@ void indent_text()
          // Pop Question from stack in ternary operator
          if (  options::indent_inside_ternary_operator()
             && pc->Is(CT_COND_COLON)
-            && frm.top().type == CT_QUESTION)
+            && frm.top().GetOpenToken() == CT_QUESTION)
          {
             LOG_FMT(LINDLINE, "%s(%d): pc orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
                     __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
             frm.pop(__func__, __LINE__, pc);
-            indent_column_set(frm.top().indent_tmp);
+            indent_column_set(frm.top().GetIndentTmp());
          }
          frm.push(pc, __func__, __LINE__);
 
-         frm.top().indent     = frm.prev().indent + indent_size;
-         frm.top().indent_tab = frm.top().indent;
+         frm.top().SetIndent(frm.prev().GetIndent() + indent_size);
+         frm.top().SetIndentTab(frm.top().GetIndent());
          log_indent();
-         frm.top().indent_tmp = frm.top().indent;
+         frm.top().SetIndentTmp(frm.top().GetIndent());
          log_indent_tmp();
       }
       else if (  pc->Is(CT_LAMBDA)
@@ -3291,24 +3335,24 @@ void indent_text()
       {
          log_rule_B("indent_cs_delegate_body");
          frm.push(pc, __func__, __LINE__);
-         frm.top().indent = frm.prev().indent;
+         frm.top().SetIndent(frm.prev().GetIndent());
          log_indent();
 
          if (  pc->GetPrevNc()->IsNewline()
-            && !frm.prev().pc->IsOnSameLine(pc->GetPrevNcNnl()))
+            && !frm.prev().GetOpenChunk()->IsOnSameLine(pc->GetPrevNcNnl()))
          {
-            frm.top().indent = frm.prev().indent + indent_size;
+            frm.top().SetIndent(frm.prev().GetIndent() + indent_size);
             log_indent();
-            reindent_line(pc, (frm.prev().indent + indent_size));
+            reindent_line(pc, (frm.prev().GetIndent() + indent_size));
             did_newline = false;
          }
          else if (  pc->GetNextNc()->IsNewline()
-                 && !frm.prev().pc->IsOnSameLine(frm.top().pc))
+                 && !frm.prev().GetOpenChunk()->IsOnSameLine(frm.top().GetOpenChunk()))
          {
-            frm.top().indent = frm.prev().indent + indent_size;
+            frm.top().SetIndent(frm.prev().GetIndent() + indent_size);
          }
          log_indent();
-         frm.top().indent_tmp = frm.top().indent;
+         frm.top().SetIndentTmp(frm.top().GetIndent());
          log_indent_tmp();
       }
       else if (  options::indent_oc_inside_msg_sel()
@@ -3321,10 +3365,10 @@ void indent_text()
          // [Class Message:<here>
          frm.push(pc, __func__, __LINE__);
 
-         frm.top().indent     = frm.prev().indent;
-         frm.top().indent_tab = frm.prev().indent_tab;
+         frm.top().SetIndent(frm.prev().GetIndent());
+         frm.top().SetIndentTab(frm.prev().GetIndentTab());
          log_indent();
-         frm.top().indent_tmp = frm.prev().indent_tmp;
+         frm.top().SetIndentTmp(frm.prev().GetIndentTmp());
          log_indent_tmp();
       }
       else if (pc->IsComment())
@@ -3460,9 +3504,9 @@ void indent_text()
             && in_shift)
          {
             shiftcontcol = calc_indent_continue(frm);
-            // Setting frm.top().indent_cont = true in the top context when the indent is not also set
+            // Calling frm.top().SetIndentContinue(true) in the top context when the indent is not also set
             // just leads to complications when succeeding statements try to indent based on being
-            // embedded in a continuation. In other words setting frm.top().indent_cont = true
+            // embedded in a continuation. In other words setting frm.top().SetIndentContinue(true)
             // should only be set if frm.top().indent is also set.
 
             // Work around the doubly increased indent in RETURNs and assignments
@@ -3471,8 +3515,8 @@ void indent_text()
 
             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).GetOpenToken() == CT_RETURN
+                  || frm.at(i).GetOpenToken() == CT_ASSIGN)
                {
                   need_workaround = true;
                   sub             = frm.size() - i;
@@ -3503,16 +3547,16 @@ void indent_text()
          else if (options::indent_continue() != 0)
          {
             vardefcol = calc_indent_continue(frm);
-            // Setting frm.top().indent_cont = true in the top context when the indent is not also set
+            // Calling frm.top().SetIndentContinue(true) in the top context when the indent is not also set
             // just leads to complications when succeeding statements try to indent based on being
-            // embedded in a continuation. In other words setting frm.top().indent_cont = true
+            // embedded in a continuation. In other words setting frm.top().SetIndentContinue(true)
             // should only be set if frm.top().indent is also set.
          }
          else if (  options::indent_var_def_cont()
                  || pc->GetPrev()->IsNewline())
          {
             log_rule_B("indent_var_def_cont");
-            vardefcol = frm.top().indent + indent_size;
+            vardefcol = frm.top().GetIndent() + indent_size;
          }
          else
          {
@@ -3557,12 +3601,19 @@ void indent_text()
          && !pc->IsNewline()
          && (pc->Len() != 0))
       {
-         pc->SetColumnIndent(frm.top().indent_tab);
+         if (  pc->TestFlags(PCF_CONT_LINE)
+            && options::indent_continue() < 0)
+         {
+            log_rule_B("indent_continue");
+            indent_column = calc_indent_continue(frm);
+            log_indent();
+         }
+         pc->SetColumnIndent(frm.top().GetIndentTab());
 
-         if (frm.top().ip.ref)
+         if (frm.top().GetIndentData().ref)
          {
-            pc->IndentData().ref   = frm.top().ip.ref;
-            pc->IndentData().delta = frm.top().ip.delta;
+            pc->IndentData().ref   = frm.top().GetIndentData().ref;
+            pc->IndentData().delta = frm.top().GetIndentData().delta;
          }
          LOG_FMT(LINDENT2, "%s(%d): orig line is %zu, pc->GetColumn() indent is %zu, indent_column is %zu, for '%s'\n",
                  __func__, __LINE__, pc->GetOrigLine(), pc->GetColumnIndent(), indent_column, pc->ElidedText(copy));
@@ -3649,13 +3700,13 @@ void indent_text()
          else if (  pc->Is(CT_NAMESPACE)
                  && options::indent_namespace()
                  && options::indent_namespace_single_indent()
-                 && frm.top().ns_cnt)
+                 && frm.top().GetNsCount())
          {
             log_rule_B("indent_namespace");
             log_rule_B("indent_namespace_single_indent");
             LOG_FMT(LINDENT, "%s(%d): orig line is %zu, Namespace => %zu\n",
-                    __func__, __LINE__, pc->GetOrigLine(), frm.top().brace_indent);
-            reindent_line(pc, frm.top().brace_indent);
+                    __func__, __LINE__, pc->GetOrigLine(), frm.top().GetBraceIndent());
+            reindent_line(pc, frm.top().GetBraceIndent());
          }
          else if (  pc->Is(CT_STRING)
                  && prev->Is(CT_STRING)
@@ -3671,8 +3722,8 @@ void indent_text()
          else if (pc->IsComment())
          {
             LOG_FMT(LINDENT, "%s(%d): orig line is %zu, comment => %zu\n",
-                    __func__, __LINE__, pc->GetOrigLine(), frm.top().indent_tmp);
-            indent_comment(pc, frm.top().indent_tmp);
+                    __func__, __LINE__, pc->GetOrigLine(), frm.top().GetIndentTmp());
+            indent_comment(pc, frm.top().GetIndentTmp());
          }
          else if (pc->Is(CT_PREPROC))
          {
@@ -3690,12 +3741,12 @@ void indent_text()
             LOG_FMT(LINDLINE, "%s(%d): indent_column is %zu\n",
                     __func__, __LINE__, indent_column);
 
-            if (frm.poped().type == E_Token(pc->GetType() - 1))
+            if (frm.lastPopped().GetOpenToken() == E_Token(pc->GetType() - 1))
             {
                // Issue # 405
                LOG_FMT(LINDLINE, "%s(%d): orig line is %zu, orig col is %zu, Text() is '%s', type is %s\n",
                        __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
-               Chunk *ck1 = frm.poped().pc;
+               Chunk *ck1 = frm.lastPopped().GetOpenChunk();
                LOG_FMT(LINDLINE, "%s(%d): ck1 orig line is %zu, orig col is %zu, Text() is '%s', GetType() is %s\n",
                        __func__, __LINE__, ck1->GetOrigLine(), ck1->GetOrigCol(), ck1->Text(), get_token_name(ck1->GetType()));
                Chunk *ck2 = ck1->GetPrev();
@@ -3733,10 +3784,10 @@ void indent_text()
                      // indent_paren_close is 0 or 1
                      LOG_FMT(LINDLINE, "%s(%d): [%zu:%zu] indent_paren_close is 0 or 1\n",
                              __func__, __LINE__, ck2->GetOrigLine(), ck2->GetOrigCol());
-                     indent_column_set(frm.poped().indent_tmp);
+                     indent_column_set(frm.lastPopped().GetIndentTmp());
                      LOG_FMT(LINDLINE, "%s(%d): [%zu:%zu] indent_column set to %zu\n",
                              __func__, __LINE__, ck2->GetOrigLine(), ck2->GetOrigCol(), indent_column);
-                     pc->SetColumnIndent(frm.poped().indent_tab);
+                     pc->SetColumnIndent(frm.lastPopped().GetIndentTab());
                      log_rule_B("indent_paren_close");
 
                      if (options::indent_paren_close() == 1)
@@ -3793,19 +3844,19 @@ void indent_text()
 
                            if (  options::indent_oc_inside_msg_sel()
                               && search->GetPrevNcNnl()->Is(CT_OC_COLON)
-                              && (  frm.top().type == CT_OC_MSG_FUNC
-                                 || frm.top().type == CT_OC_MSG_NAME)) // Issue #2658
+                              && (  frm.top().GetOpenToken() == CT_OC_MSG_FUNC
+                                 || frm.top().GetOpenToken() == CT_OC_MSG_NAME)) // Issue #2658
                            {
                               log_rule_B("indent_oc_inside_msg_sel");
                               // [Class Message:(...)<here>
-                              indent_column_set(frm.top().pc->GetColumn());
+                              indent_column_set(frm.top().GetOpenChunk()->GetColumn());
                            }
                            else if (  options::indent_inside_ternary_operator()
-                                   && (  frm.top().type == CT_QUESTION
-                                      || frm.top().type == CT_COND_COLON)) // Issue #1130, #1715
+                                   && (  frm.top().GetOpenToken() == CT_QUESTION
+                                      || frm.top().GetOpenToken() == CT_COND_COLON)) // Issue #1130, #1715
                            {
                               log_rule_B("indent_inside_ternary_operator");
-                              indent_column_set(frm.top().indent);
+                              indent_column_set(frm.top().GetIndent());
                            }
                            else
                            {
@@ -3860,13 +3911,13 @@ void indent_text()
             bool indent_align  = false;
             bool indent_ignore = false;
 
-            if (frm.top().pc->IsParenOpen())
+            if (frm.top().GetOpenChunk()->IsParenOpen())
             {
                log_rule_B("indent_comma_paren");
                indent_align  = options::indent_comma_paren() == (int)indent_mode_e::ALIGN;
                indent_ignore = options::indent_comma_paren() == (int)indent_mode_e::IGNORE;
             }
-            else if (frm.top().pc->IsBraceOpen())
+            else if (frm.top().GetOpenChunk()->IsBraceOpen())
             {
                log_rule_B("indent_comma_brace");
                indent_align  = options::indent_comma_brace() == (int)indent_mode_e::ALIGN;
@@ -3879,7 +3930,7 @@ void indent_text()
             }
             else if (indent_align)
             {
-               indent_column_set(frm.top().pc->GetColumn());
+               indent_column_set(frm.top().GetOpenChunk()->GetColumn());
             }
             LOG_FMT(LINDENT, "%s(%d): %zu] comma => %zu [%s]\n",
                     __func__, __LINE__, pc->GetOrigLine(), indent_column, pc->Text());
@@ -3888,8 +3939,7 @@ void indent_text()
          else if (  options::indent_func_const()
                  && pc->Is(CT_QUALIFIER)
                  && strncasecmp(pc->Text(), "const", pc->Len()) == 0
-                 && (  next == nullptr
-                    || next->Is(CT_BRACED)
+                 && (  next->Is(CT_BRACED)
                     || next->IsBraceOpen()
                     || next->Is(CT_NEWLINE)
                     || next->Is(CT_SEMICOLON)
@@ -3897,7 +3947,7 @@ void indent_text()
          {
             // indent const - void GetFoo(void)\n const\n { return (m_Foo); }
             log_rule_B("indent_func_const");
-            indent_column_set(frm.top().indent + options::indent_func_const());
+            indent_column_set(frm.top().GetIndent() + options::indent_func_const());
             LOG_FMT(LINDENT, "%s(%d): %zu] const => %zu [%s]\n",
                     __func__, __LINE__, pc->GetOrigLine(), indent_column, pc->Text());
             reindent_line(pc, indent_column);
@@ -3919,13 +3969,13 @@ void indent_text()
                && options::indent_semicolon_for_paren())
             {
                log_rule_B("indent_semicolon_for_paren");
-               indent_column_set(frm.top().pc->GetColumn());
+               indent_column_set(frm.top().GetOpenChunk()->GetColumn());
 
                log_rule_B("indent_first_for_expr");
 
                if (options::indent_first_for_expr())
                {
-                  reindent_line(frm.top().pc->GetNext(),
+                  reindent_line(frm.top().GetOpenChunk()->GetNext(),
                                 indent_column + pc->Len() + 1);
                }
                LOG_FMT(LINDENT, "%s(%d): %zu] SEMICOLON => %zu [%s]\n",
@@ -3947,7 +3997,7 @@ void indent_text()
          }
          else if (pc->Is(CT_BOOL))
          {
-            if (frm.top().pc->IsParenOpen())
+            if (frm.top().GetOpenChunk()->IsParenOpen())
             {
                log_rule_B("indent_bool_paren");
 
@@ -3957,13 +4007,13 @@ void indent_text()
                }
                else if (options::indent_bool_paren() == (int)indent_mode_e::ALIGN)
                {
-                  indent_column_set(frm.top().pc->GetColumn());
+                  indent_column_set(frm.top().GetOpenChunk()->GetColumn());
 
                   log_rule_B("indent_first_bool_expr");
 
                   if (options::indent_first_bool_expr())
                   {
-                     reindent_line(frm.top().pc->GetNext(),
+                     reindent_line(frm.top().GetOpenChunk()->GetNext(),
                                    indent_column + pc->Len() + 1);
                   }
                }
@@ -4040,13 +4090,14 @@ void indent_text()
                  && pc->Is(CT_COND_COLON))
          {
             log_rule_B("indent_ternary_operator");
-            Chunk *tmp = pc->GetPrevType(CT_QUESTION);
+            // get the parent, the QUESTION
+            Chunk *question = pc->GetParent();
 
-            if (tmp->IsNotNullChunk())
+            if (question->IsNotNullChunk())
             {
                LOG_FMT(LINDENT, "%s: %zu] ternarydefcol => %zu [%s]\n",
-                       __func__, pc->GetOrigLine(), tmp->GetColumn(), pc->Text());
-               reindent_line(pc, tmp->GetColumn());
+                       __func__, pc->GetOrigLine(), question->GetColumn(), pc->Text());
+               reindent_line(pc, question->GetColumn());
             }
          }
          else if (  options::indent_oc_inside_msg_sel()
@@ -4054,7 +4105,7 @@ void indent_text()
                     || pc->Is(CT_OC_MSG_NAME))) // Issue #2658
          {
             log_rule_B("indent_oc_inside_msg_sel");
-            reindent_line(pc, frm.top().indent);
+            reindent_line(pc, frm.top().GetIndent());
          }
          else
          {
@@ -4064,9 +4115,9 @@ void indent_text()
             if (ttidx > 0)
             {
                LOG_FMT(LINDPC, "%s(%d): (frm.at(ttidx).pc)->GetParentType() is %s\n",
-                       __func__, __LINE__, get_token_name((frm.at(ttidx).pc)->GetParentType()));
+                       __func__, __LINE__, get_token_name((frm.at(ttidx).GetOpenChunk())->GetParentType()));
 
-               if ((frm.at(ttidx).pc)->GetParentType() == CT_FUNC_CALL)
+               if ((frm.at(ttidx).GetOpenChunk())->GetParentType() == CT_FUNC_CALL)
                {
                   LOG_FMT(LINDPC, "FUNC_CALL OK [%d]\n", __LINE__);
 
@@ -4138,7 +4189,7 @@ void indent_text()
                           __func__, __LINE__, frm_size);
                   // get pc
                   LOG_FMT(LINDPC, "%s(%d): Text() is '%s', (frm.at(frm_size - 1).pc)->GetType() is %s\n",
-                          __func__, __LINE__, (frm.at(frm_size - 1).pc)->Text(), get_token_name((frm.at(frm_size - 1).pc)->GetType()));
+                          __func__, __LINE__, (frm.at(frm_size - 1).GetOpenChunk())->Text(), get_token_name((frm.at(frm_size - 1).GetOpenChunk())->GetType()));
                   // get the token before
                   const size_t temp_ttidx = frm_size - 2;
 
@@ -4149,7 +4200,7 @@ void indent_text()
                   }
                   else
                   {
-                     Chunk *token_before = frm.at(temp_ttidx).pc;
+                     Chunk *token_before = frm.at(temp_ttidx).GetOpenChunk();
                      LOG_FMT(LINDPC, "%s(%d): Text() is '%s', token_before->GetType() is %s\n",
                              __func__, __LINE__, token_before->Text(), get_token_name(token_before->GetType()));
 
@@ -4157,7 +4208,7 @@ void indent_text()
 
                      if (token_before->Is(CT_ASSIGN))
                      {
-                        Chunk *before_Assign = frm.at(temp_ttidx - 1).pc;
+                        Chunk *before_Assign = frm.at(temp_ttidx - 1).GetOpenChunk();
 
                         if (before_Assign->IsNullChunk())
                         {
@@ -4180,7 +4231,7 @@ void indent_text()
                      }
                      else if (token_before->Is(CT_RETURN))
                      {
-                        Chunk *before_Return = frm.at(temp_ttidx - 1).pc;
+                        Chunk *before_Return = frm.at(temp_ttidx - 1).GetOpenChunk();
                         vor_col = before_Return->GetColumn();
                         LOG_FMT(LINDPC, "%s(%d): Text() is '%s', before_Return->GetType() is %s, column is %zu\n",
                                 __func__, __LINE__, before_Return->Text(), get_token_name(before_Return->GetType()), vor_col);
@@ -4221,8 +4272,8 @@ void indent_text()
          // Handle indent for variable defs at the top of a block of code
          if (pc->TestFlags(PCF_VAR_TYPE))
          {
-            if (  !frm.top().non_vardef
-               && (frm.top().type == CT_BRACE_OPEN))
+            if (  !frm.top().GetNonVardef()
+               && (frm.top().GetOpenToken() == CT_BRACE_OPEN))
             {
                log_rule_B("indent_var_def_blk");
                int val = options::indent_var_def_blk();
@@ -4240,9 +4291,9 @@ void indent_text()
                }
             }
          }
-         else if (pc != frm.top().pc)
+         else if (pc != frm.top().GetOpenChunk())
          {
-            frm.top().non_vardef = true;
+            frm.top().SetNonVardef(true);
          }
       }
 
@@ -4252,7 +4303,7 @@ void indent_text()
          || pc->Is(CT_COMMENT_CPP))
       {
          log_indent();
-         frm.top().indent_tmp = frm.top().indent;
+         frm.top().SetIndentTmp(frm.top().GetIndent());
          log_indent_tmp();
 
          /*
@@ -4260,10 +4311,10 @@ void indent_text()
           * first line (indent_tmp will be 1 or 0)
           */
          if (  pc->Is(CT_NL_CONT)
-            && frm.top().indent_tmp <= indent_size
-            && frm.top().type != CT_PP_DEFINE)
+            && frm.top().GetIndentTmp() <= indent_size
+            && frm.top().GetOpenToken() != CT_PP_DEFINE)
          {
-            frm.top().indent_tmp = indent_size + 1;
+            frm.top().SetIndentTmp(indent_size + 1);
             log_indent_tmp();
          }
          // Get ready to indent the next item
@@ -4301,16 +4352,16 @@ void indent_text()
 
          if (options::indent_ignore_first_continue())
          {
-            frm.top().indent = get_indent_first_continue(pc);
+            frm.top().SetIndent(get_indent_first_continue(pc));
          }
          else
          {
-            frm.top().indent = frm.prev().indent + options::indent_continue_class_head();
+            frm.top().SetIndent(frm.prev().GetIndent() + options::indent_continue_class_head());
          }
          log_indent();
 
-         frm.top().indent_tmp = frm.top().indent;
-         frm.top().indent_tab = frm.top().indent;
+         frm.top().SetIndentTmp(frm.top().GetIndent());
+         frm.top().SetIndentTab(frm.top().GetIndent());
          log_indent_tmp();
          classFound = true;
       }
@@ -4327,14 +4378,14 @@ null_pc:
 
    // Throw out any stuff inside a preprocessor - no need to warn
    while (  !frm.empty()
-         && frm.top().in_preproc)
+         && frm.top().GetInPreproc())
    {
       frm.pop(__func__, __LINE__, pc);
    }
 
    // Throw out any VBRACE_OPEN at the end - implied with the end of file
    while (  !frm.empty()
-         && frm.top().type == CT_VBRACE_OPEN)
+         && frm.top().GetOpenToken() == CT_VBRACE_OPEN)
    {
       frm.pop(__func__, __LINE__, pc);
    }
@@ -4344,9 +4395,9 @@ null_pc:
       LOG_FMT(LWARN, "%s(%d): size is %zu\n",
               __func__, __LINE__, frm.size());
       LOG_FMT(LWARN, "%s(%d): File: %s, open_line is %zu, parent is %s: Unmatched %s\n",
-              __func__, __LINE__, cpd.filename.c_str(), frm.at(idx_temp).open_line,
-              get_token_name(frm.at(idx_temp).parent),
-              get_token_name(frm.at(idx_temp).type));
+              __func__, __LINE__, cpd.filename.c_str(), frm.at(idx_temp).GetOpenLine(),
+              get_token_name(frm.at(idx_temp).GetParent()),
+              get_token_name(frm.at(idx_temp).GetOpenToken()));
       exit(EX_IOERR);
    }
 
@@ -4402,11 +4453,11 @@ static bool single_line_comment_indent_rule_applies(Chunk *start, bool forward)
 } // single_line_comment_indent_rule_applies
 
 
-static bool is_end_of_assignment(Chunk *pc, const ParseFrame &frm)
+static bool is_end_of_assignment(Chunk *pc, const ParsingFrame &frm)
 {
-   return(  (  frm.top().type == CT_ASSIGN_NL
-            || frm.top().type == CT_MEMBER
-            || frm.top().type == CT_ASSIGN)
+   return(  (  frm.top().GetOpenToken() == CT_ASSIGN_NL
+            || frm.top().GetOpenToken() == CT_MEMBER
+            || frm.top().GetOpenToken() == CT_ASSIGN)
          && (  pc->IsSemicolon()
             || pc->Is(CT_COMMA)
             || pc->Is(CT_BRACE_OPEN)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/indent.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/indent.h
index e1fe384c..ee927638 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/indent.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/indent.h
@@ -1,6 +1,6 @@
 /**
  * @file indent.h
- * prototypes for indent.c
+ * prototypes for indent.cpp
  *
  * @author  Ben Gardner
  * @license GPL v2+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/keywords.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/keywords.cpp
index 6b4757ca..98ff84a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/keywords.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/keywords.cpp
@@ -4,7 +4,7 @@
  *
  * @author  Ben Gardner
  * @author  Guy Maurel since version 0.62 for uncrustify4Qt
- *          October 2015, 2016
+ *          October 2015, 2023
  * @license GPL v2+
  */
 
@@ -14,6 +14,11 @@
 #include "prototypes.h"
 #include "uncrustify.h"
 #include "uncrustify_limits.h"
+//# define DEBUG_LANGUAGE
+// see also the call to dump_keyword_for_lang
+#ifdef DEBUG_LANGUAGE
+#include "unc_tools.h"
+#endif
 
 #include <cerrno>
 #include <map>
@@ -161,6 +166,7 @@ static chunk_tag_t keywords[] =
    { "assert",                          CT_ASSERT,           LANG_JAVA                                                                   },
    { "assert",                          CT_FUNCTION,         LANG_D | LANG_PAWN                                                          },
    { "assert",                          CT_PP_ASSERT,        LANG_PAWN | FLAG_PP                                                         },
+   { "async",                           CT_QUALIFIER,        LANG_VALA                                                                   },
    { "auto",                            CT_TYPE,             LANG_C | LANG_CPP | LANG_D                                                  },
    { "base",                            CT_BASE,             LANG_CS | LANG_VALA                                                         },
    { "bit",                             CT_TYPE,             LANG_D                                                                      },
@@ -171,7 +177,6 @@ static chunk_tag_t keywords[] =
    { "boolean",                         CT_TYPE,             LANG_JAVA | LANG_ECMA                                                       },
    { "break",                           CT_BREAK,            LANG_ALL                                                                    },
    { "byte",                            CT_TYPE,             LANG_CS | LANG_D | LANG_JAVA | LANG_ECMA                                    },
-   { "callback",                        CT_QUALIFIER,        LANG_VALA                                                                   },
    { "case",                            CT_CASE,             LANG_ALL                                                                    },
    { "cast",                            CT_D_CAST,           LANG_D                                                                      },
    { "catch",                           CT_CATCH,            LANG_CPP | LANG_CS | LANG_VALA | LANG_D | LANG_JAVA | LANG_ECMA             },
@@ -202,6 +207,7 @@ static chunk_tag_t keywords[] =
    { "deprecated",                      CT_QUALIFIER,        LANG_D                                                                      },
    { "do",                              CT_DO,               LANG_ALL                                                                    },
    { "double",                          CT_TYPE,             LANG_ALLC                                                                   },
+   { "dynamic",                         CT_QUALIFIER,        LANG_VALA                                                                   },
    { "dynamic_cast",                    CT_TYPE_CAST,        LANG_CPP                                                                    },
    { "elif",                            CT_PP_ELSE,          LANG_ALLC | FLAG_PP                                                         },
    { "else",                            CT_ELSE,             LANG_ALL                                                                    },
@@ -283,14 +289,15 @@ static chunk_tag_t keywords[] =
    { "or_eq",                           CT_SASSIGN,          LANG_CPP                                                                    },
    { "out",                             CT_QUALIFIER,        LANG_CS | LANG_D | LANG_VALA                                                },
    { "override",                        CT_QUALIFIER,        LANG_CPP | LANG_CS | LANG_D | LANG_VALA                                     },
+   { "owned",                           CT_QUALIFIER,        LANG_VALA                                                                   },
    { "package",                         CT_ACCESS,           LANG_D                                                                      },
    { "package",                         CT_PACKAGE,          LANG_ECMA | LANG_JAVA                                                       },
    { "params",                          CT_TYPE,             LANG_CS | LANG_VALA                                                         },
    { "pragma",                          CT_PP_PRAGMA,        LANG_ALL | FLAG_PP                                                          },
-   { "private",                         CT_ACCESS,           LANG_ALLC                                                                   }, // not C
+   { "private",                         CT_ACCESS,           LANG_ALLC_NOT_C                                                             }, // Issue # 4044
    { "property",                        CT_PP_PROPERTY,      LANG_CS | FLAG_PP                                                           },
-   { "protected",                       CT_ACCESS,           LANG_ALLC                                                                   }, // not C
-   { "public",                          CT_ACCESS,           LANG_ALL                                                                    }, // PAWN // not C
+   { "protected",                       CT_ACCESS,           LANG_ALLC_NOT_C                                                             }, // Issue # 4044
+   { "public",                          CT_ACCESS,           LANG_ALLC_NOT_C                                                             }, // Issue # 4044
    { "readonly",                        CT_QUALIFIER,        LANG_CS                                                                     },
    { "real",                            CT_TYPE,             LANG_D                                                                      },
    { "ref",                             CT_QUALIFIER,        LANG_CS | LANG_VALA                                                         },
@@ -347,6 +354,7 @@ static chunk_tag_t keywords[] =
    { "undef",                           CT_PP_UNDEF,         LANG_ALL | FLAG_PP                                                          },
    { "union",                           CT_UNION,            LANG_C | LANG_CPP | LANG_D                                                  },
    { "unittest",                        CT_UNITTEST,         LANG_D                                                                      },
+   { "unowned",                         CT_QUALIFIER,        LANG_VALA                                                                   },
    { "unsafe",                          CT_UNSAFE,           LANG_CS                                                                     },
    { "unsafe_unretained",               CT_QUALIFIER,        LANG_OC                                                                     },
    { "unsigned",                        CT_TYPE,             LANG_C | LANG_CPP                                                           },
@@ -394,8 +402,12 @@ void init_keywords_for_language()
       }
    }
 
-   LOG_FMT(LDYNKW, "%s(%d): Number of Keywords for language %d: '%zu'\n",
-           __func__, __LINE__, local_flags, language_count);
+#ifdef DEBUG_LANGUAGE
+   dump_keyword_for_lang(language_count, keyword_for_lang);
+#endif
+
+   LOG_FMT(LDYNKW, "%s(%d): Number of Keywords for language %s: '%zu'\n",
+           __func__, __LINE__, language_name_from_flags(local_flags), language_count);
 } // init_keywords_for_language
 
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/keywords.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/keywords.h
index 7dc431c5..25a4a536 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/keywords.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/keywords.h
@@ -1,6 +1,6 @@
 /**
  * @file keywords.h
- * prototypes for keywords.c
+ * prototypes for keywords.cpp
  *
  * @author  Ben Gardner
  * @license GPL v2+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/lang_pawn.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/lang_pawn.cpp
index 70722c74..fe999a2a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/lang_pawn.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/lang_pawn.cpp
@@ -124,7 +124,7 @@ static bool pawn_continued(Chunk *pc, size_t br_level)
 {
    LOG_FUNC_ENTRY();
 
-   if (pc == nullptr)
+   if (pc->IsNullChunk())
    {
       return(false);
    }
@@ -177,8 +177,7 @@ void pawn_prescan()
    bool  did_nl = true;
    Chunk *pc    = Chunk::GetHead();
 
-   while (  pc != nullptr
-         && pc->IsNotNullChunk())
+   while (pc->IsNotNullChunk())
    {
       if (  did_nl
          && pc->IsNot(CT_PREPROC)
@@ -190,8 +189,7 @@ void pawn_prescan()
       }
 
       // note that continued lines are ignored
-      if (  pc != nullptr
-         && pc->IsNotNullChunk())
+      if (pc->IsNotNullChunk())
       {
          did_nl = (pc->Is(CT_NEWLINE));
       }
@@ -213,7 +211,7 @@ static Chunk *pawn_process_line(Chunk *start)
       return(pawn_process_variable(start));
    }
    // if a open paren is found before an assign, then this is a function
-   Chunk *fcn = nullptr;
+   Chunk *fcn = Chunk::NullChunkPtr;
 
    if (start->Is(CT_WORD))
    {
@@ -243,7 +241,7 @@ static Chunk *pawn_process_line(Chunk *start)
       }
    }
 
-   if (fcn != nullptr)
+   if (fcn->IsNotNullChunk())
    {
       //LOG_FMT(LSYS, "FUNCTION: %s\n", fcn->Text());
       return(pawn_mark_function0(start, fcn));
@@ -265,8 +263,7 @@ static Chunk *pawn_process_variable(Chunk *start)
    LOG_FUNC_ENTRY();
    Chunk *pc = Chunk::NullChunkPtr;
 
-   if (  start != nullptr
-      && start->IsNotNullChunk())
+   if (start->IsNotNullChunk())
    {
       pc = start;
    }
@@ -471,8 +468,7 @@ static Chunk *pawn_process_func_def(Chunk *pc)
          last = prev;
       } while ((prev = prev->GetNext())->IsNotNullChunk());
 
-      if (  last != nullptr
-         && last->IsNotNullChunk())
+      if (last->IsNotNullChunk())
       {
          LOG_FMT(LPFUNC, "%s:%zu] ended on %s, level %zu\n",
                  __func__, last->GetOrigLine(), get_token_name(last->GetType()), last->GetLevel());
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/lang_pawn.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/lang_pawn.h
index 03766a08..7f4c503d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/lang_pawn.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/lang_pawn.h
@@ -1,6 +1,6 @@
 /**
  * @file long_pawn.h
- * prototypes for long_pawn.c
+ * prototypes for long_pawn.cpp
  *
  * @author  Ben Gardner
  * @license GPL v2+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/language_names.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/language_names.cpp
new file mode 100644
index 00000000..546b240e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/language_names.cpp
@@ -0,0 +1,227 @@
+/**
+ * @file language_names.cpp
+ *
+ * @author  Guy Maurel
+ * extract from uncrustify.cpp
+ * @license GPL v2+
+ */
+
+#include "language_names.h"
+
+static lang_name_t language_names[] =
+{
+   { "C",        LANG_C                       },      // 0x0001
+   { "CPP",      LANG_CPP                     },      // 0x0002
+   { "D",        LANG_D                       },      // 0x0004
+   { "CS",       LANG_CS                      },      // 0x0008
+   { "JAVA",     LANG_JAVA                    },      // 0x0010
+   { "OC",       LANG_OC                      },      // 0x0020
+   { "VALA",     LANG_VALA                    },      // 0x0040
+   { "PAWN",     LANG_PAWN                    },      // 0x0080
+   { "ECMA",     LANG_ECMA                    },      // 0x0100
+   { "OC+",      LANG_OC | LANG_CPP           },      // 0x0020 + 0x0002
+   { "CS+",      LANG_CS | LANG_CPP           },      // 0x0008 + 0x0002
+   { "C-Header", LANG_C | LANG_CPP | FLAG_HDR },      // 0x0001 + 0x0002 + 0x2000 = 0x2022
+};
+
+
+//! known filename extensions linked to the corresponding programming language
+struct lang_ext_t language_exts[] =
+{
+   { ".c",    "C"        },
+   { ".c++",  "CPP"      },
+   { ".cc",   "CPP"      },
+   { ".cp",   "CPP"      },
+   { ".cpp",  "CPP"      },
+   { ".cs",   "CS"       },
+   { ".cxx",  "CPP"      },
+   { ".d",    "D"        },
+   { ".di",   "D"        },
+   { ".es",   "ECMA"     },
+   { ".h",    "C-Header" },
+   { ".h++",  "CPP"      },
+   { ".hh",   "CPP"      },
+   { ".hp",   "CPP"      },
+   { ".hpp",  "CPP"      },
+   { ".hxx",  "CPP"      },
+   { ".inc",  "PAWN"     },
+   { ".inl",  "CPP"      },
+   { ".java", "JAVA"     },
+   { ".js",   "ECMA"     },
+   { ".m",    "OC"       },
+   { ".mm",   "OC+"      },
+   { ".p",    "PAWN"     },
+   { ".pawn", "PAWN"     },
+   { ".sma",  "PAWN"     },
+   { ".sqc",  "C"        },  // embedded SQL
+   { ".sql",  "SQL"      },
+   { ".vala", "VALA"     },
+   { ".vapi", "VALA"     },
+};
+
+
+size_t language_flags_from_name(const char *name)
+{
+   for (const auto &language : language_names)
+   {
+      if (strcasecmp(name, language.name) == 0)
+      {
+         return(language.lang);
+      }
+   }
+
+   return(0);
+}
+
+
+const char *language_name_from_flags(size_t lang)
+{
+   // Check for an exact match first
+   for (auto &language_name : language_names)
+   {
+      if (language_name.lang == lang)
+      {
+         return(language_name.name);
+      }
+   }
+
+   static char lang_liste[120];
+   lang_liste[0] = '\0';
+
+   // Check for the next set language bit
+   for (auto &language_name : language_names)
+   {
+      if (strcmp(language_name.name, "OC+") == 0)
+      {
+         break;
+      }
+
+      if ((language_name.lang & lang) != 0)
+      {
+         if (lang_liste[0] == '\0')
+         {
+            strcpy(lang_liste, language_name.name);
+         }
+         else
+         {
+            int ll = strlen(lang_liste);
+            strcpy(&lang_liste[ll], ", ");
+            strcpy(&lang_liste[ll + 2], language_name.name);
+         }
+      }
+   }
+
+   return(lang_liste);
+} // language_name_from_flags
+
+
+bool ends_with(const char *filename, const char *tag, bool case_sensitive = true)
+{
+   int len1 = strlen(filename);
+   int len2 = strlen(tag);
+
+   return(  len2 <= len1
+         && (  (  case_sensitive
+               && (strcmp(&filename[len1 - len2], tag) == 0))
+            || (  !case_sensitive
+               && (strcasecmp(&filename[len1 - len2], tag) == 0))));
+} // ends_with
+
+
+const char *get_file_extension(int &idx)
+{
+   const char *val = nullptr;
+
+   if (idx < static_cast<int> ARRAY_SIZE(language_exts))
+   {
+      val = language_exts[idx].ext;
+   }
+   idx++;
+   return(val);
+} // get_file_extension
+
+
+////typedef std::map<std::string, std::string> extension_map_t;
+//static extension_map_t g_ext_map;
+
+
+const char *extension_add(const char *ext_text, const char *lang_text)
+{
+   size_t lang_flags = language_flags_from_name(lang_text);
+
+   if (lang_flags)
+   {
+      const char *lang_name = language_name_from_flags(lang_flags);
+      g_ext_map[std::string(ext_text)] = lang_name;
+      return(lang_name);
+   }
+   return(nullptr);
+}
+
+
+void print_extensions(FILE *pfile)
+{
+   for (auto &language : language_names)
+   {
+      bool did_one = false;
+
+      for (auto &extension_val : g_ext_map)
+      {
+         if (strcmp(extension_val.second.c_str(), language.name) == 0)
+         {
+            if (!did_one)
+            {
+               fprintf(pfile, "file_ext %s", extension_val.second.c_str());
+               did_one = true;
+            }
+            fprintf(pfile, " %s", extension_val.first.c_str());
+         }
+      }
+
+      if (did_one)
+      {
+         fprintf(pfile, "\n");
+      }
+   }
+}
+
+
+// TODO: better use enum lang_t for source file language
+size_t language_flags_from_filename(const char *filename)
+{
+   // check custom extensions first
+   for (const auto &extension_val : g_ext_map)
+   {
+      if (ends_with(filename, extension_val.first.c_str()))
+      {
+         return(language_flags_from_name(extension_val.second.c_str()));
+      }
+   }
+
+   for (auto &language : language_exts)
+   {
+      if (ends_with(filename, language.ext))
+      {
+         return(language_flags_from_name(language.name));
+      }
+   }
+
+   // check again without case sensitivity
+   for (auto &extension_val : g_ext_map)
+   {
+      if (ends_with(filename, extension_val.first.c_str(), false))
+      {
+         return(language_flags_from_name(extension_val.second.c_str()));
+      }
+   }
+
+   for (auto &language : language_exts)
+   {
+      if (ends_with(filename, language.ext, false))
+      {
+         return(language_flags_from_name(language.name));
+      }
+   }
+
+   return(LANG_C);
+} // language_flags_from_filename
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/language_names.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/language_names.h
new file mode 100644
index 00000000..df63d894
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/language_names.h
@@ -0,0 +1,109 @@
+/**
+ * @file language_names.h
+ *
+ * @author  Guy Maurel
+ * extract from uncrustify.cpp
+ * @license GPL v2+
+ */
+
+#ifndef LANGUAGE_NAMES_H_INCLUDED
+#define LANGUAGE_NAMES_H_INCLUDED
+
+#include "base_types.h"
+
+#include <cstddef>      // to get size_t
+#include <cstdio>
+#include <map>
+#include <string>
+#include <string.h>
+//#include <strings.h>
+
+struct lang_name_t
+{
+   const char *name;
+   size_t     lang;
+};
+
+//! list of all programming languages Uncrustify supports
+enum lang_flag_e
+{
+   LANG_C          = 0x0001,
+   LANG_CPP        = 0x0002,
+   LANG_D          = 0x0004,
+   LANG_CS         = 0x0008,     //! C# (C-Sharp)
+   LANG_JAVA       = 0x0010,
+   LANG_OC         = 0x0020,     //! Objective-C
+   LANG_VALA       = 0x0040,
+   LANG_PAWN       = 0x0080,
+   LANG_ECMA       = 0x0100,     //! ECMA Script (JavaScript)
+
+   LANG_ALLC_NOT_C = 0x017e,     /**             LANG_CPP | LANG_D    | LANG_CS   |            Issue # 4044
+                                  *  LANG_JAVA | LANG_OC  | LANG_VALA | LANG_ECMA   */
+   LANG_ALLC       = 0x017f,     /** LANG_C    | LANG_CPP | LANG_D    | LANG_CS   |
+                                  *  LANG_JAVA | LANG_OC  | LANG_VALA | LANG_ECMA   */
+   LANG_ALL        = 0x0fff,     //! applies to all languages
+
+   FLAG_HDR        = 0x2000,     /*<< Header file for C family languages */
+   FLAG_DIG        = 0x4000,     //! digraph/trigraph
+   FLAG_PP         = 0x8000,     //! only appears in a preprocessor
+};
+
+
+size_t language_flags_from_name(const char *name);
+
+
+/**
+ * Gets the tag text for a language
+ *
+ * @param lang  The LANG_xxx enum
+ *
+ * @return A string
+ */
+const char *language_name_from_flags(size_t lang);
+
+bool ends_with(const char *filename, const char *tag, bool case_sensitive);
+
+
+//! type to map a programming language to a typically used filename extension
+struct lang_ext_t
+{
+   const char *ext;  //! filename extension typically used for ...
+   const char *name; //! a programming language
+};
+
+
+/**
+ * Set idx = 0 before the first call.
+ * Done when returns nullptr
+ */
+const char *get_file_extension(int &idx);
+
+
+typedef std::map<std::string, std::string> extension_map_t;
+/**
+ * maps a file extension to a language flag.
+ *
+ * @note The "." need to be included, as in ".c". The file extensions
+ *       ARE case sensitive.
+ */
+static extension_map_t g_ext_map;
+
+
+const char *extension_add(const char *ext_text, const char *lang_text);
+
+
+//! Prints custom file extensions to the file
+void print_extensions(FILE *pfile);
+
+
+// TODO: better use enum lang_t for source file language
+/**
+ * Find the language for the file extension
+ * Defaults to C
+ *
+ * @param filename   The name of the file
+ * @return           LANG_xxx
+ */
+size_t language_flags_from_filename(const char *filename);
+
+#endif /* LANGUAGE_NAMES_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/language_tools.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/language_tools.cpp
index 77e577f4..77e577f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/language_tools.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/language_tools.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/language_tools.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/language_tools.h
index 5f57c3f1..5f57c3f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/language_tools.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/language_tools.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/log_levels.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/log_levels.h
index 266e1981..db2acf71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/log_levels.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/log_levels.h
@@ -119,8 +119,8 @@ enum log_sev_t
    LINDENTAG = 88,  //! indent again
    LNFD      = 89,  //! newline-function-def
    LJDBI     = 90,  //! Java Double Brace Init
-   LSETPAR   = 91,  //! Chunk::SetParentTypeReal()
-   LSETTYP   = 92,  //! Chunk::SetTypeReal()
+   LSETPAR   = 91,  //! Chunk::SetParentType()
+   LSETTYP   = 92,  //! Chunk::SetType()
    LSETFLG   = 93,  //! set_chunk_flags()
    LNLFUNCT  = 94,  //! newlines before function
    LCHUNK    = 95,  //! Add or delete chunk
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/log_rules.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/log_rules.cpp
index ec5f6240..01e6b7fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/log_rules.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/log_rules.cpp
@@ -61,15 +61,15 @@ void log_rule4(const char *rule, Chunk *first)
 
    if (first->GetTrackingData() == nullptr)
    {
-      first->TrackingData() = new track_list;
+      first->TrackingData() = new TrackList;
    }
    // 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);
+   size_t      a_number = get_A_Number();
+   TrackNumber A        = make_pair(a_number, r);
 
    first->TrackingData()->push_back(A);
    size_t sizeOfTrack = first->GetTrackingData()->size();
@@ -79,6 +79,33 @@ void log_rule4(const char *rule, Chunk *first)
 }
 
 
+void log_ruleStart(const char *rule, Chunk *first)
+{
+   if (!(cpd.html_type == tracking_type_e::TT_START))
+   {
+      return;
+   }
+
+   if (first->GetTrackingData() == nullptr)
+   {
+      first->TrackingData() = new TrackList;
+   }
+   // copy the rule
+   size_t length = strlen(rule) + 1;
+   char   *r     = (char *)malloc(length);
+
+   strcpy(r, rule);
+   size_t      a_number = get_A_Number();
+   TrackNumber A        = make_pair(a_number, r);
+
+   first->TrackingData()->push_back(A);
+   size_t sizeOfTrack = first->GetTrackingData()->size();
+
+   LOG_FMT(LSPACE, "log_ruleStart(%d): rule is '%s', '%s', at line %zu, tracking number is %zu, size is %zu\n",
+           __LINE__, rule, first->Text(), first->GetOrigLine(), a_number, sizeOfTrack);
+} // log_ruleStart
+
+
 void log_ruleNL(const char *rule, Chunk *pc)
 {
    if (!(cpd.html_type == tracking_type_e::TT_NEWLINE))
@@ -88,15 +115,15 @@ void log_ruleNL(const char *rule, Chunk *pc)
 
    if (pc->GetTrackingData() == nullptr)
    {
-      pc->TrackingData() = new track_list;
+      pc->TrackingData() = new TrackList;
    }
    // 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);
+   size_t      a_number = get_A_Number();
+   TrackNumber A        = make_pair(a_number, r);
 
    pc->TrackingData()->push_back(A);
    size_t sizeOfTrack = pc->GetTrackingData()->size();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/log_rules.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/log_rules.h
index 02345a25..1c1583e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/log_rules.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/log_rules.h
@@ -14,14 +14,9 @@
 
 using namespace uncrustify;
 
-#if defined DEBUG
 #define log_rule(rule)                                   \
    log_rule2(__func__, __LINE__, (rule), first, second); \
    log_rule4((rule), first)
-#else
-#define log_rule(rule) \
-   log_rule2(__func__, __LINE__, (rule), first, second)
-#endif
 
 // if you need more debug information, remove the comment at the next line
 #define SUPER_LOG    1
@@ -54,6 +49,8 @@ void log_rule3(log_sev_t sev, const char *func, const char *rule);
 
 void log_rule4(const char *rule, Chunk *first);
 
+void log_ruleStart(const char *rule, Chunk *first);
+
 void log_ruleNL(const char *rule, Chunk *pc);
 
 #endif /* LOG_RULES_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/logger.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/logger.cpp
index c9a50682..f2f6e626 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/logger.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/logger.cpp
@@ -279,7 +279,7 @@ void log_func_stack(log_sev_t sev, const char *prefix, const char *suffix, size_
 {
    UNUSED(skip_cnt);
 
-   if (prefix)
+   if (prefix != nullptr)
    {
       LOG_FMT(sev, "%s", prefix);
    }
@@ -304,7 +304,7 @@ void log_func_stack(log_sev_t sev, const char *prefix, const char *suffix, size_
    LOG_FMT(sev, "-DEBUG NOT SET-");
 #endif
 
-   if (suffix)
+   if (suffix != nullptr)
    {
       LOG_FMT(sev, "%s", suffix);
    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/logger.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/logger.h
index 9b27fbab..9b27fbab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/logger.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/logger.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/logmask.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/logmask.cpp
index 148ce193..148ce193 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/logmask.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/logmask.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/logmask.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/logmask.h
index ef00e1d0..ef00e1d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/logmask.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/logmask.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/mark_functor.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/mark_functor.cpp
new file mode 100644
index 00000000..40bec01e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/mark_functor.cpp
@@ -0,0 +1,114 @@
+/**
+ * @file mark_functor.cpp
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ */
+
+#include "mark_functor.h"
+
+#include "chunk.h"
+
+
+/*
+ * tokenize the functor such as:
+ * desc->add_options() ( a ) (b)(c);
+ */
+void mark_functor()
+{
+   LOG_FUNC_ENTRY();
+   bool  found_functor  = false;
+   Chunk *is_it_closing = Chunk::NullChunkPtr;
+
+   // Issue #3914
+   for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
+   {
+      LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() '%s'\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel(), pc->Text());
+
+      if (pc->Is(CT_SEMICOLON))
+      {
+         found_functor = false;
+         continue;
+      }
+
+      if (found_functor)
+      {
+         if (  pc->Is(CT_FPAREN_CLOSE)
+            || pc->Is(CT_RPAREN_CLOSE))
+         {
+            LOG_FMT(LCOMBINE, "%s(%d): FOUND a Closing: orig line is %zu, orig col is %zu, level is %zu, Text() '%s'\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel(), pc->Text());
+            // desc->add_options() ( a ) (
+            //                         ^
+            pc->SetType(CT_RPAREN_CLOSE);
+         }
+         else if (  pc->Is(CT_FPAREN_OPEN)
+                 || pc->Is(CT_RPAREN_OPEN))
+         {
+            LOG_FMT(LCOMBINE, "%s(%d): FOUND a Opening: orig line is %zu, orig col is %zu, level is %zu, Text() '%s'\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel(), pc->Text());
+            // desc->add_options() ( a ) (
+            //                           ^
+            pc->SetType(CT_RPAREN_OPEN);
+         }
+         else // pc->Is(CT_FPAREN_CLOSE) || pc->Is(CT_RPAREN_CLOSE))
+         {
+            continue;
+         }
+      }
+      else // (found_functor)
+      {
+         if (pc->Is(CT_FPAREN_OPEN))
+         {
+            LOG_FMT(LCOMBINE, "%s(%d): FOUND 1 Opening: orig line is %zu, orig col is %zu, level is %zu, Text() '%s'\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel(), pc->Text());
+            is_it_closing = pc->GetPrevNcNnl();
+            LOG_FMT(LCOMBINE, "%s(%d): FOUND 2 Closing: orig line is %zu, orig col is %zu, level is %zu, Text() '%s'\n",
+                    __func__, __LINE__, is_it_closing->GetOrigLine(), is_it_closing->GetOrigCol(), is_it_closing->GetLevel(), is_it_closing->Text());
+
+            if (is_it_closing->Is(CT_FPAREN_CLOSE))
+            {
+               Chunk *opening = is_it_closing->GetOpeningParen();
+               LOG_FMT(LCOMBINE, "%s(%d): FOUND 3 Opening: orig line is %zu, orig col is %zu, level is %zu, Text() '%s'\n",
+                       __func__, __LINE__, opening->GetOrigLine(), opening->GetOrigCol(), opening->GetLevel(), opening->Text());
+               // look for member function
+               Chunk *is_it_func = opening->GetPrevNcNnl();
+               LOG_FMT(LCOMBINE, "%s(%d): FOUND 4 func: orig line is %zu, orig col is %zu, level is %zu, Text() '%s'\n",
+                       __func__, __LINE__, is_it_func->GetOrigLine(), is_it_func->GetOrigCol(), is_it_func->GetLevel(), is_it_func->Text());
+               Chunk *is_it_member = is_it_func->GetPrevNcNnl();     // CT_MEMBER
+               LOG_FMT(LCOMBINE, "%s(%d): FOUND 5 func: orig line is %zu, orig col is %zu, level is %zu, Text() '%s'\n",
+                       __func__, __LINE__, is_it_member->GetOrigLine(), is_it_member->GetOrigCol(), is_it_member->GetLevel(), is_it_member->Text());
+
+               if (is_it_member->Is(CT_MEMBER))
+               {
+                  // set parenthesis at the function
+                  // desc->add_options() ( a ) (
+                  //                   ^
+                  is_it_closing->SetType(CT_RPAREN_CLOSE);
+                  // desc->add_options() ( a ) (
+                  //                  ^
+                  opening->SetType(CT_RPAREN_OPEN);
+                  // desc->add_options() ( a ) (
+                  //                     ^
+                  pc->SetType(CT_RPAREN_OPEN);
+                  found_functor = true;
+               }
+               else
+               {
+                  continue;
+               }
+            }
+            else
+            {
+               LOG_FMT(LCOMBINE, "%s(%d): NOT useable\n", __func__, __LINE__);
+               continue;
+            }
+         }
+         else // (pc->Is(CT_FPAREN_OPEN))
+         {
+            continue;
+         } // (pc->Is(CT_FPAREN_OPEN))
+      } // (found_functor)
+   }
+} // mark_functor
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/mark_functor.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/mark_functor.h
new file mode 100644
index 00000000..f9449ea9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/mark_functor.h
@@ -0,0 +1,13 @@
+/**
+ * @file mark_functor.h
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ */
+
+#ifndef MARK_FUNCTOR_H_INCLUDED
+#define MARK_FUNCTOR_H_INCLUDED
+
+void mark_functor();
+
+#endif /* MARK_FUNCTOR_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/mark_question_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/mark_question_colon.cpp
new file mode 100644
index 00000000..84131bc7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/mark_question_colon.cpp
@@ -0,0 +1,192 @@
+/**
+ * @file mark_question_colon.cpp
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ */
+
+#include "mark_question_colon.h"
+
+#include "chunk.h"
+#include "combine_tools.h"
+#include "log_levels.h"
+
+
+/*
+ * Issue #3558
+ * will be called if a ? (CT_QUESTION) chunk is encountered
+ * return the chunk colon if found or Chunk::NullChunkPtr
+ * if a ; (CT_SEMI_COLON) chunk is found
+ */
+Chunk *search_for_colon(Chunk *pc_question)
+{
+   Chunk *pc2        = pc_question->GetNextNcNnl();
+   bool  colon_found = false;
+
+   LOG_FMT(LCOMBINE, "%s(%d): pc_question.orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
+           __func__, __LINE__, pc_question->GetOrigLine(), pc_question->GetOrigCol(), pc_question->GetLevel(),
+           pc_question->Text());
+
+   // examine the next tokens, look for E2, E3, COLON, might be for a next CT_QUESTION
+   while (pc2->IsNotNullChunk())
+   {
+      LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
+              __func__, __LINE__, pc2->GetOrigLine(), pc2->GetOrigCol(), pc2->GetLevel(), pc2->Text());
+
+      if (  pc2->Is(CT_SEMICOLON)
+         || (  pc2->Is(CT_PAREN_CLOSE)
+            && (pc_question->GetLevel() == pc2->GetLevel() + 1))
+         || pc2->Is(CT_COMMA))
+      {
+         LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
+                 __func__, __LINE__, pc2->GetOrigLine(), pc2->GetOrigCol(), pc2->GetLevel(), pc2->Text());
+         pc2->SetFlagBits(PCF_IN_CONDITIONAL);
+         log_pcf_flags(LCOMBINE, pc2->GetFlags());
+
+         if (colon_found)
+         {
+            LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
+                    __func__, __LINE__, pc2->GetOrigLine(), pc2->GetOrigCol(), pc2->GetLevel(), pc2->Text());
+            pc_question->SetParent(pc2);   // back again
+
+            LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
+                    __func__, __LINE__, pc2->GetOrigLine(), pc2->GetOrigCol(), pc2->GetLevel(), pc2->Text());
+            return(pc2);
+         }
+         else
+         {
+            pc2->SetParent(pc_question);   // save the question token
+            pc_question->SetParent(pc2);   // back again
+         }
+      }
+      else if (pc2->Is(CT_COMMA))
+      {
+         // TODO: is it necessary?
+      }
+      else if (pc2->Is(CT_QUESTION))
+      {
+         LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
+                 __func__, __LINE__, pc2->GetOrigLine(), pc2->GetOrigCol(), pc2->GetLevel(), pc2->Text());
+         pc2 = search_for_colon(pc2);
+         LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
+                 __func__, __LINE__, pc2->GetOrigLine(), pc2->GetOrigCol(), pc2->GetLevel(), pc2->Text());
+         continue;
+      }
+      else if (pc2->Is(CT_COND_COLON))
+      {
+         LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
+                 __func__, __LINE__, pc2->GetOrigLine(), pc2->GetOrigCol(), pc2->GetLevel(), pc2->Text());
+
+         if (colon_found)
+         {
+            LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
+                    __func__, __LINE__, pc2->GetOrigLine(), pc2->GetOrigCol(), pc2->GetLevel(), pc2->Text());
+            Chunk *pr = pc2->GetPrevNcNnl();
+            return(pr);
+         }
+         else
+         {
+            pc2->SetParent(pc_question);              // save the question token
+            pc_question->SetParent(pc2);              // back again
+            colon_found = true;
+         }
+
+         if (pc2->Is(CT_COLON))
+         {
+            if (colon_found)
+            {
+               return(pc2);
+            }
+            else
+            {
+            }
+         }
+      }
+      else if (pc2->Is(CT_COLON))
+      {
+         LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
+                 __func__, __LINE__, pc2->GetOrigLine(), pc2->GetOrigCol(), pc2->GetLevel(), pc2->Text());
+
+         if (colon_found)
+         {
+            pc2->SetType(CT_COND_COLON);
+            return(pc2);
+         }
+         else
+         {
+            // E2 found   orig line is 23, orig col is 3
+            pc2->SetType(CT_COND_COLON);
+            LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
+                    __func__, __LINE__, pc2->GetOrigLine(), pc2->GetOrigCol(), pc2->GetLevel(), pc2->Text());
+            pc2->SetParent(pc_question);              // save the question token
+            pc_question->SetParent(pc2);              // back again
+
+            // look for E3
+            colon_found = true;
+         }
+      }
+      pc2 = pc2->GetNextNcNnl();
+   }
+
+   if (pc2->IsNotNullChunk())
+   {
+      LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '?'\n",
+              __func__, __LINE__, pc2->GetOrigLine(), pc2->GetOrigCol(), pc2->GetLevel());
+   }
+   LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '?'\n",
+           __func__, __LINE__, pc2->GetOrigLine(), pc2->GetOrigCol(), pc2->GetLevel());
+   return(pc2);
+} // search_for_colon
+
+
+void mark_question_colon()
+{
+   LOG_FUNC_ENTRY();
+   Chunk *pc = Chunk::GetHead();
+   Chunk *pc_question;
+
+   // Issue #3558
+   while (pc->IsNotNullChunk())
+   {
+      LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() '%s'\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel(), pc->Text());
+      log_pcf_flags(LCOMBINE, pc->GetFlags());
+
+      if (  pc->Is(CT_QUESTION)
+         && !language_is_set(LANG_JAVA))
+      {
+         pc_question = pc;
+         // look for E2, COLON, E3...
+         pc = search_for_colon(pc);
+
+         LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel(), pc->Text());
+
+         if (  pc->Is(CT_SEMICOLON)
+            || (  pc->Is(CT_PAREN_CLOSE)
+               && (pc_question->GetLevel() == pc->GetLevel() + 1))
+            || pc->Is(CT_COMMA))
+         {
+            // set at the end of the question statement ...
+            LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() is '%s'\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel(), pc->Text());
+            // ... and go on
+         }
+      }
+      pc = pc->GetNextNcNnl();
+   }
+
+   for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
+   {
+      LOG_FMT(LCOMBINE, "%s(%d): orig line is %zu, orig col is %zu, level is %zu, Text() '%s'\n",
+              __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel(), pc->Text());
+
+      if (pc->Is(CT_QUESTION))
+      {
+         Chunk *from = pc;
+         Chunk *to   = pc->GetParent();
+         flag_series(from, to, PCF_IN_CONDITIONAL);
+         pc = to;
+      }
+   }
+} // mark_question_colon
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/mark_question_colon.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/mark_question_colon.h
index 20fca294..20fca294 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/mark_question_colon.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/mark_question_colon.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/md5.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/md5.cpp
index af8874a4..af8874a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/md5.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/md5.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/md5.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/md5.h
index d1148b5e..d1148b5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/md5.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/md5.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/newlines.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/newlines.cpp
index ca24e941..360e568a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/newlines.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/newlines.cpp
@@ -463,9 +463,9 @@ static void setup_newline_add(Chunk *prev, Chunk *nl, Chunk *next)
 {
    LOG_FUNC_ENTRY();
 
-   if (  prev == nullptr
-      || nl == nullptr
-      || next == nullptr)
+   if (  prev->IsNullChunk()
+      || nl->IsNullChunk()
+      || next->IsNullChunk())
    {
       return;
    }
@@ -504,12 +504,7 @@ void double_newline(Chunk *nl)
 {
    LOG_FUNC_ENTRY();
 
-   Chunk *prev = Chunk::NullChunkPtr;
-
-   if (nl != nullptr)
-   {
-      prev = nl->GetPrev();
-   }
+   Chunk *prev = nl->GetPrev();
 
    if (prev->IsNullChunk())
    {
@@ -589,7 +584,7 @@ Chunk *newline_add_after(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   if (pc == nullptr)
+   if (pc->IsNullChunk())
    {
       return(Chunk::NullChunkPtr);
    }
@@ -728,11 +723,11 @@ Chunk *newline_add_between(Chunk *start, Chunk *end)
 {
    LOG_FUNC_ENTRY();
 
-   if (  start == nullptr
-      || end == nullptr
+   if (  start->IsNullChunk()
+      || end->IsNullChunk()
       || end->Is(CT_IGNORED))
    {
-      return(nullptr);
+      return(Chunk::NullChunkPtr);
    }
    LOG_FMT(LNEWLINE, "%s(%d): start->Text() is '%s', type is %s, orig line is %zu, orig col is %zu\n",
            __func__, __LINE__, start->Text(), get_token_name(start->GetType()),
@@ -744,7 +739,7 @@ Chunk *newline_add_between(Chunk *start, Chunk *end)
    // Back-up check for one-liners (should never be true!)
    if (!one_liner_nl_ok(start))
    {
-      return(nullptr);
+      return(Chunk::NullChunkPtr);
    }
 
    /*
@@ -861,7 +856,9 @@ void newline_del_between(Chunk *start, Chunk *end)
 
                if (prev->IsNotNullChunk())
                {
-                  align_to_column(next, prev->GetColumn() + space_col_align(prev, next));
+                  size_t temp = space_col_align(prev, next);
+                  align_to_column(next, prev->GetColumn() + temp);
+                  dump_step(dump_file_name, "del 1");
                }
             }
          }
@@ -1042,7 +1039,7 @@ static void newlines_if_for_while_switch_pre_blank_lines(Chunk *start, iarf_e nl
    {
       size_t level    = start->GetLevel();
       bool   do_add   = (nl_opt & IARF_ADD) != IARF_IGNORE;  // forcing value to bool
-      Chunk  *last_nl = nullptr;
+      Chunk  *last_nl = Chunk::NullChunkPtr;
 
       if (pc->IsNewline())
       {
@@ -1089,7 +1086,7 @@ static void newlines_if_for_while_switch_pre_blank_lines(Chunk *start, iarf_e nl
       else if (pc->IsComment())
       {
          // vbrace close is ok because it won't go into output, so we should skip it
-         last_nl = nullptr;
+         last_nl = Chunk::NullChunkPtr;
          continue;
       }
       else
@@ -1103,8 +1100,7 @@ static void newlines_if_for_while_switch_pre_blank_lines(Chunk *start, iarf_e nl
          if (do_add) // we found something previously besides a comment or a new line
          {
             // if we have run across a newline
-            if (  last_nl != nullptr
-               && last_nl->IsNotNullChunk())
+            if (last_nl->IsNotNullChunk())
             {
                if (last_nl->GetNlCount() < 2)
                {
@@ -1138,7 +1134,7 @@ static void blank_line_set(Chunk *pc, Option<unsigned> &opt)
 {
    LOG_FUNC_ENTRY();
 
-   if (pc == nullptr)
+   if (pc->IsNullChunk())
    {
       return;
    }
@@ -1159,7 +1155,7 @@ bool do_it_newlines_func_pre_blank_lines(Chunk *last_nl, E_Token start_type)
 {
    LOG_FUNC_ENTRY();
 
-   if (last_nl == nullptr)
+   if (last_nl->IsNullChunk())
    {
       return(false);
    }
@@ -1266,7 +1262,7 @@ static void newlines_func_pre_blank_lines(Chunk *start, E_Token start_type)
    log_rule_B("nl_before_func_body_def");
    log_rule_B("nl_before_func_body_proto");
 
-   if (  start == nullptr
+   if (  start->IsNullChunk()
       || (  (  start_type != CT_FUNC_CLASS_DEF
             || options::nl_before_func_class_def() == 0)
          && (  start_type != CT_FUNC_CLASS_PROTO
@@ -1289,9 +1285,9 @@ static void newlines_func_pre_blank_lines(Chunk *start, E_Token start_type)
     *   - a destructor
     *   - something else (don't remove)
     */
-   Chunk  *pc           = nullptr;
-   Chunk  *last_nl      = nullptr;
-   Chunk  *last_comment = nullptr;
+   Chunk  *pc           = Chunk::NullChunkPtr;
+   Chunk  *last_nl      = Chunk::NullChunkPtr;
+   Chunk  *last_comment = Chunk::NullChunkPtr;
    size_t first_line    = start->GetOrigLine();
 
    for (pc = start->GetPrev(); pc->IsNotNullChunk(); pc = pc->GetPrev())
@@ -1332,7 +1328,7 @@ static void newlines_func_pre_blank_lines(Chunk *start, E_Token start_type)
          if (  (  pc->GetOrigLine() < first_line
                && ((first_line - pc->GetOrigLine()
                     - (pc->Is(CT_COMMENT_MULTI) ? pc->GetNlCount() : 0))) < 2)
-            || (  last_comment != nullptr
+            || (  last_comment->IsNotNullChunk()
                && pc->Is(CT_COMMENT_CPP)          // combine only cpp comments
                && last_comment->Is(pc->GetType()) // don't mix comment types
                && last_comment->GetOrigLine() > pc->GetOrigLine()
@@ -1407,11 +1403,11 @@ static Chunk *get_closing_brace(Chunk *start)
       if (  !pc->IsNewline()
          && pc->GetLevel() < level)
       {
-         return(nullptr);
+         return(Chunk::NullChunkPtr);
       }
    }
 
-   return(nullptr);
+   return(Chunk::NullChunkPtr);
 } // get_closing_brace
 
 
@@ -1461,7 +1457,7 @@ static void newlines_if_for_while_switch_post_blank_lines(Chunk *start, iarf_e n
    Chunk *pc = get_closing_brace(start);
 
    // first find ending brace
-   if (pc == nullptr)
+   if (pc->IsNullChunk())
    {
       return;
    }
@@ -1485,7 +1481,7 @@ static void newlines_if_for_while_switch_post_blank_lines(Chunk *start, iarf_e n
                || next->Is(CT_ELSEIF)))
          {
             // point to the closing brace of the else
-            if ((pc = get_closing_brace(next)) == nullptr)
+            if ((pc = get_closing_brace(next))->IsNullChunk())
             {
                return;
             }
@@ -1772,7 +1768,7 @@ static void newlines_enum(Chunk *start)
          // look for ':'
          Chunk *pcColon = pcType->GetNextNcNnl();
 
-         if (pcColon->Is(CT_BIT_COLON))
+         if (pcColon->Is(CT_ENUM_COLON))                       // Issue #4040
          {
             log_rule_B("nl_enum_identifier_colon");
             newline_iarf_pair(pcType, pcColon, options::nl_enum_identifier_colon());
@@ -2007,7 +2003,6 @@ static bool is_func_call_or_def(Chunk *pc)
 // Put newline(s) before and/or after a block of variable definitions
 static Chunk *newline_var_def_blk(Chunk *start)
 {
-//prot_the_line(__func__, __LINE__, 15, 4);
    LOG_FUNC_ENTRY();
 
    Chunk *pc           = start;
@@ -2023,8 +2018,7 @@ static Chunk *newline_var_def_blk(Chunk *start)
    if (start->Is(CT_BRACE_OPEN))
    {
       // can't be any variable definitions in a "= {" block
-      if (  (prev != nullptr)
-         && prev->IsNotNullChunk()
+      if (  prev->IsNotNullChunk()
          && prev->Is(CT_ASSIGN))
       {
          Chunk *tmp = start->GetClosingParen();
@@ -2179,9 +2173,9 @@ static Chunk *newline_var_def_blk(Chunk *start)
                LOG_FMT(LVARDFBLK, "%s(%d): pc is '%s', orig line is %zu\n",
                        __func__, __LINE__, pc->Text(), pc->GetOrigLine());
 
-               if (prev == nullptr)
+               if (prev->IsNullChunk())
                {
-                  LOG_FMT(LVARDFBLK, "%s(%d): prev is nullptr\n", __func__, __LINE__);
+                  LOG_FMT(LVARDFBLK, "%s(%d): prev is a null chunk\n", __func__, __LINE__);
                }
                else
                {
@@ -2232,7 +2226,6 @@ static Chunk *newline_var_def_blk(Chunk *start)
                {
                   LOG_FMT(LVARDFBLK, "%s(%d): nl_var_def_blk_end_func_top at line %zu\n",
                           __func__, __LINE__, prev->GetOrigLine());
-                  prot_the_line(__func__, __LINE__, 15, 4);
                   newline_min_after(prev, options::nl_var_def_blk_end_func_top() + 1, PCF_VAR_DEF);
                }
             }
@@ -2246,7 +2239,6 @@ static Chunk *newline_var_def_blk(Chunk *start)
                newline_min_after(prev, options::nl_var_def_blk_end() + 1, PCF_VAR_DEF);
             }
             // reset the variables for the next block
-            prot_the_line(__func__, __LINE__, 15, 4);
             first_var_blk = false;
             var_blk       = false;
          }
@@ -2286,7 +2278,6 @@ static Chunk *newline_var_def_blk(Chunk *start)
            __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), pc->GetLevel());
    LOG_FMT(LVARDFBLK, "%s(%d): start orig line is %zu, orig col is %zu, Text() is '%s', level is %zu\n",
            __func__, __LINE__, start->GetOrigLine(), start->GetOrigCol(), start->Text(), start->GetLevel());
-   //prot_the_line(__func__, __LINE__, 15, 4);
    return(pc);
 } // newline_var_def_blk
 
@@ -3928,8 +3919,8 @@ void newlines_cleanup_angles()
 
 void newlines_cleanup_braces(bool first)
 {
-//prot_the_line(__func__, __LINE__, 15, 4);
    LOG_FUNC_ENTRY();
+   dump_step(dump_file_name, "new 2");
 
    // Get the first token that's not an empty line:
    Chunk *pc = Chunk::GetHead();
@@ -3941,7 +3932,6 @@ void newlines_cleanup_braces(bool first)
 
    for ( ; pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
-//prot_the_line(__func__, __LINE__, 15, 4);
       char copy[1000];
       LOG_FMT(LBLANK, "%s(%d): orig line is %zu, orig col is %zu, Text() is '%s'\n",
               __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->ElidedText(copy));
@@ -4294,10 +4284,12 @@ void newlines_cleanup_braces(bool first)
                   LOG_FMT(LNL1LINE, "a new line may NOT be added (nl_after_brace_open)\n");
                   // no change - preserve one liner body
                }
-               else if (  pc->TestFlags(PCF_IN_ARRAY_ASSIGN)
-                       || pc->TestFlags(PCF_IN_PREPROC))
+               else if (  pc->TestFlags(PCF_IN_PREPROC)
+                       || (  pc->TestFlags(PCF_ONE_LINER)
+                          && pc->TestFlags(PCF_IN_ARRAY_ASSIGN)
+                          && options::nl_assign_leave_one_liners()))
                {
-                  // no change - don't break up array assignments or preprocessors
+                  // no change - don't break up preprocessors
                }
                else
                {
@@ -5112,9 +5104,7 @@ void newlines_cleanup_braces(bool first)
       }
    }
 
-//prot_the_line(__func__, __LINE__, 15, 4);
    newline_var_def_blk(Chunk::GetHead());
-//prot_the_line(__func__, __LINE__, 15, 4);
 } // newlines_cleanup_braces
 
 
@@ -6380,17 +6370,43 @@ void do_blank_lines()
                   blank_line_set(pc, options::nl_after_func_body_class);
                }
             }
-            else if (options::nl_after_func_body() > 0)
+            else
             {
-               log_rule_B("nl_after_func_body");
-
-               // Issue #1734
-               if (!(pc->GetPrev()->TestFlags(PCF_IN_TRY_BLOCK)))
+               if (!(pc->GetPrev()->TestFlags(PCF_IN_TRY_BLOCK))) // Issue #1734
                {
-                  if (options::nl_after_func_body() != pc->GetNlCount())
+                  if (options::nl_after_func_body() > 0)
                   {
                      log_rule_B("nl_after_func_body");
-                     blank_line_set(pc, options::nl_after_func_body);
+
+                     if (options::nl_after_func_body() != pc->GetNlCount())
+                     {
+                        log_rule_B("nl_after_func_body");
+                        blank_line_set(pc, options::nl_after_func_body);
+                     }
+                  }
+                  else
+                  {
+                     if (options::nl_min_after_func_body() > 0) // Issue #2787
+                     {
+                        log_rule_B("nl_min_after_func_body");
+
+                        if (options::nl_min_after_func_body() > pc->GetNlCount())
+                        {
+                           log_rule_B("nl_min_after_func_body");
+                           blank_line_set(pc, options::nl_min_after_func_body);
+                        }
+                     }
+
+                     if (options::nl_max_after_func_body() > 0)
+                     {
+                        log_rule_B("nl_max_after_func_body");
+
+                        if (options::nl_max_after_func_body() < pc->GetNlCount())
+                        {
+                           log_rule_B("nl_max_after_func_body");
+                           blank_line_set(pc, options::nl_max_after_func_body);
+                        }
+                     }
                   }
                }
             }
@@ -6702,27 +6718,22 @@ static void newlines_enum_entries(Chunk *open_brace, iarf_e av)
 {
    LOG_FUNC_ENTRY();
 
-   Chunk *pc = Chunk::NullChunkPtr;
-
-   if (open_brace != nullptr)
-   {
-      pc = open_brace;
-   }
-
-   while (  (pc = pc->GetNextNc())->IsNotNullChunk()
-         && pc->GetLevel() > open_brace->GetLevel())
+   for (Chunk *pc = open_brace->GetNextNc();
+        pc->IsNotNullChunk() && pc->GetLevel() > open_brace->GetLevel();
+        pc = pc->GetNextNc())
    {
       if (  (pc->GetLevel() != (open_brace->GetLevel() + 1))
          || pc->IsNot(CT_COMMA)
          || (  pc->Is(CT_COMMA)
-            && pc->GetNext()->IsNotNullChunk()
             && (  pc->GetNext()->GetType() == CT_COMMENT_CPP
-               || pc->GetNext()->GetType() == CT_COMMENT)))
+               || pc->GetNext()->GetType() == CT_COMMENT
+               || pc->GetNext()->GetType() == CT_COMMENT_MULTI)))
       {
          continue;
       }
       newline_iarf(pc, av);
    }
+
    newline_iarf(open_brace, av);
 } // newlines_enum_entries
 
@@ -6826,8 +6837,8 @@ void annotations_newlines()
 
 bool newlines_between(Chunk *pc_start, Chunk *pc_end, size_t &newlines, E_Scope scope)
 {
-   if (  pc_start == nullptr
-      || pc_end == nullptr)
+   if (  pc_start->IsNullChunk()
+      || pc_end->IsNullChunk())
    {
       return(false);
    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/newlines.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/newlines.h
index f75d6ad5..c9e15511 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/newlines.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/newlines.h
@@ -1,6 +1,6 @@
 /**
  * @file newlines.h
- * prototypes for newlines.c
+ * prototypes for newlines.cpp
  *
  * @author  Ben Gardner
  * @license GPL v2+
@@ -84,7 +84,7 @@ void newlines_eat_start_end();
 /**
  * Searches for a chunk of type chunk_type and moves them, if needed.
  * Will not move tokens that are on their own line or have other than
- * exactly 1 newline before (UO_pos_comma == TRAIL) or after (UO_pos_comma == LEAD).
+ * exactly 1 newline before (options::pos_comma() == TRAIL) or after (options::pos_comma() == LEAD).
  * We can't remove a newline if it is right before a preprocessor.
  */
 void newlines_chunk_pos(E_Token chunk_type, uncrustify::token_pos_e mode);
@@ -197,7 +197,7 @@ Chunk *newline_add_between(Chunk *start, Chunk *end);
  *                   (will be initialized with 0)
  * @param  scope     specifies region chunks should/should not be considered.
  *
- * @return false  if pc_start or pc_end are nullptr or if pc_end is not reached
+ * @return false  if pc_start or pc_end are null chunks or if pc_end is not reached
  * @return true   if above cases are not met
  */
 bool newlines_between(Chunk *pc_start, Chunk *pc_end, size_t &newlines, E_Scope scope = E_Scope::ALL);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/option.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/option.cpp
index ea29d065..be09ac2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/option.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/option.cpp
@@ -11,6 +11,7 @@
 #include "option.h"
 
 #include "keywords.h"
+#include "language_names.h"
 #include "uncrustify.h"
 #include "uncrustify_version.h"
 
@@ -1033,7 +1034,7 @@ void process_option_line(const std::string &config_line, const char *filename,
       else if (is_path_relative(include_path))
       {
          // include is a relative path to the current config file
-         unc_text ut = std::string{ filename };
+         UncText ut = std::string{ filename };
          ut.resize(static_cast<unsigned>(path_dirname_len(filename)));
          ut.append(include_path);
          UNUSED(load_option_file(ut.c_str(), compat_level));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/option.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/option.h
index 7b961940..7b961940 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/option.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/option.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/option_enum.cpp.in b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/option_enum.cpp.in
index aeb976b2..aeb976b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/option_enum.cpp.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/option_enum.cpp.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/option_enum.h.in b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/option_enum.h.in
index e50a9281..e50a9281 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/option_enum.h.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/option_enum.h.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/options.cpp.in b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/options.cpp.in
index 2ee14c8b..2ee14c8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/options.cpp.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/options.cpp.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/options.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/options.h
index 7fabf1f7..52dbebed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/options.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/options.h
@@ -150,6 +150,13 @@ 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> ){ ... }'
+// with an empty list.
+extern Option<iarf_e>
+sp_cpp_lambda_argument_list_empty;
+
+// 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;
@@ -265,10 +272,43 @@ sp_before_ptr_star;
 extern Option<iarf_e>
 sp_before_unnamed_ptr_star;
 
+// Add or remove space before pointer star '*' that is followed by a qualifier.
+// If set to ignore, sp_before_unnamed_ptr_star is used instead.
+extern Option<iarf_e>
+sp_before_qualifier_ptr_star;
+
+// Add or remove space before pointer star '*' that is followed by 'operator' keyword.
+// If set to ignore, sp_before_unnamed_ptr_star is used instead.
+extern Option<iarf_e>
+sp_before_operator_ptr_star;
+
+// Add or remove space before pointer star '*' that is followed by
+// a class scope (as in 'int *MyClass::method()') or namespace scope
+// (as in 'int *my_ns::func()').
+// If set to ignore, sp_before_unnamed_ptr_star is used instead.
+extern Option<iarf_e>
+sp_before_scope_ptr_star;
+
+// Add or remove space before pointer star '*' that is followed by '::',
+// as in 'int *::func()'.
+// If set to ignore, sp_before_unnamed_ptr_star is used instead.
+extern Option<iarf_e>
+sp_before_global_scope_ptr_star;
+
+// Add or remove space between a qualifier and a pointer star '*' that isn't
+// followed by a variable name, as in '(char const *)'. If set to ignore,
+// sp_before_ptr_star is used instead.
+extern Option<iarf_e>
+sp_qualifier_unnamed_ptr_star;
+
 // Add or remove space between pointer stars '*', as in 'int ***a;'.
 extern Option<iarf_e>
 sp_between_ptr_star;
 
+// Add or remove space between pointer star '*' and reference '&', as in 'int *& a;'.
+extern Option<iarf_e>
+sp_between_ptr_ref;
+
 // Add or remove space after pointer star '*', if followed by a word.
 //
 // Overrides sp_type_func.
@@ -311,15 +351,28 @@ extern Option<iarf_e>
 sp_ptr_star_paren;
 
 // Add or remove space before a pointer star '*', if followed by a function
-// prototype or function definition.
+// prototype or function definition. If set to ignore, sp_before_ptr_star is
+// used instead.
 extern Option<iarf_e>
 sp_before_ptr_star_func;
 
+// Add or remove space between a qualifier and a pointer star '*' followed by
+// the name of the function in a function prototype or definition, as in
+// 'char const *foo()`. If set to ignore, sp_before_ptr_star is used instead.
+extern Option<iarf_e>
+sp_qualifier_ptr_star_func;
+
 // Add or remove space before a pointer star '*' in the trailing return of a
 // function prototype or function definition.
 extern Option<iarf_e>
 sp_before_ptr_star_trailing;
 
+// Add or remove space between a qualifier and a pointer star '*' in the
+// trailing return of a function prototype or function definition, as in
+// 'auto foo() -> char const *'.
+extern Option<iarf_e>
+sp_qualifier_ptr_star_trailing;
+
 // Add or remove space before a reference sign '&'.
 extern Option<iarf_e>
 sp_before_byref;
@@ -388,6 +441,7 @@ extern Option<iarf_e>
 sp_inside_angle;
 
 // Add or remove space inside '<>'.
+// if empty.
 extern Option<iarf_e>
 sp_inside_angle_empty;
 
@@ -551,6 +605,7 @@ extern Option<iarf_e>
 sp_inside_square;
 
 // Add or remove space inside '[]'.
+// if empty.
 extern Option<iarf_e>
 sp_inside_square_empty;
 
@@ -741,6 +796,7 @@ extern Option<iarf_e>
 sp_inside_braces;
 
 // Add or remove space inside '{}'.
+// if empty.
 extern Option<iarf_e>
 sp_inside_braces_empty;
 
@@ -763,7 +819,7 @@ extern Option<iarf_e>
 sp_func_proto_paren;
 
 // Add or remove space between function name and '()' on function declaration
-// without parameters.
+// if empty.
 extern Option<iarf_e>
 sp_func_proto_paren_empty;
 
@@ -776,7 +832,7 @@ extern Option<iarf_e>
 sp_func_def_paren;
 
 // Add or remove space between function name and '()' on function definition
-// without parameters.
+// if empty.
 extern Option<iarf_e>
 sp_func_def_paren_empty;
 
@@ -789,6 +845,19 @@ sp_inside_fparens;
 extern Option<iarf_e>
 sp_inside_fparen;
 
+// Add or remove space inside user functor '(' and ')'.
+extern Option<iarf_e>
+sp_func_call_user_inside_rparen;
+
+// Add or remove space inside empty functor '()'.
+// Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
+extern Option<iarf_e>
+sp_inside_rparens;
+
+// Add or remove space inside functor '(' and ')'.
+extern Option<iarf_e>
+sp_inside_rparen;
+
 // Add or remove space inside the first parentheses in a function type, as in
 // 'void (*x)(...)'.
 extern Option<iarf_e>
@@ -1189,6 +1258,16 @@ sp_extern_paren;
 extern Option<iarf_e>
 sp_cmt_cpp_start;
 
+// remove space after the '//' and the pvs command '-V1234',
+// only works with sp_cmt_cpp_start set to add or force.
+extern Option<bool>
+sp_cmt_cpp_pvs;
+
+// remove space after the '//' and the command 'lint',
+// only works with sp_cmt_cpp_start set to add or force.
+extern Option<bool>
+sp_cmt_cpp_lint;
+
 // 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
@@ -1283,6 +1362,14 @@ sp_after_noexcept;
 extern Option<iarf_e>
 sp_vala_after_translation;
 
+// Add or remove space before a bit colon ':'.
+extern Option<iarf_e>
+sp_before_bit_colon;
+
+// Add or remove space after a bit colon ':'.
+extern Option<iarf_e>
+sp_after_bit_colon;
+
 // If true, a <TAB> is inserted after #define.
 extern Option<bool>
 force_tab_after_define;
@@ -2797,9 +2884,24 @@ extern Option<bool>
 nl_class_leave_one_liner_groups;
 
 // The number of newlines after '}' of a multi-line function body.
+//
+// Overrides nl_min_after_func_body and nl_max_after_func_body.
 extern BoundedOption<unsigned, 0, 16>
 nl_after_func_body;
 
+// The minimum number of newlines after '}' of a multi-line function body.
+//
+// Only works when nl_after_func_body is 0.
+extern BoundedOption<unsigned, 0, 16>
+nl_min_after_func_body;
+
+// The maximum number of newlines after '}' of a multi-line function body.
+//
+// Only works when nl_after_func_body is 0.
+// Takes precedence over nl_min_after_func_body.
+extern BoundedOption<unsigned, 0, 16>
+nl_max_after_func_body;
+
 // The number of newlines after '}' of a multi-line function body in a class
 // declaration. Also affects class constructors/destructors.
 //
@@ -3410,6 +3512,14 @@ align_right_cmt_at_col;
 extern BoundedOption<unsigned, 0, 5000>
 align_func_proto_span;
 
+// Whether to ignore continuation lines when evaluating the number of
+// new lines for the function prototype alignment's span.
+//
+// false: continuation lines are part of the newlines count
+// true:  continuation lines are not counted
+extern Option<bool>
+align_func_proto_span_ignore_cont_lines; // = false
+
 // How to consider (or treat) the '*' in the alignment of function prototypes.
 //
 // 0: Part of the type     'void *   foo();' (default)
@@ -3469,11 +3579,23 @@ align_single_line_brace_gap;
 extern BoundedOption<unsigned, 0, 5000>
 align_oc_msg_spec_span;
 
-// Whether to align macros wrapped with a backslash and a newline. This will
-// not work right if the macro contains a multi-line comment.
-extern Option<bool>
+// Whether and how to align backslashes that split a macro onto multiple lines.
+// This will not work right if the macro contains a multi-line comment.
+//
+// 0: Do nothing (default)
+// 1: Align the backslashes in the column at the end of the longest line
+// 2: Align with the backslash that is farthest to the left, or, if that
+//    backslash is farther left than the end of the longest line, at the end of
+//    the longest line
+// 3: Align with the backslash that is farthest to the right
+extern BoundedOption<unsigned, 0, 3>
 align_nl_cont;
 
+// The minimum number of spaces between the end of a line and its continuation
+// backslash. Requires align_nl_cont.
+extern BoundedOption<unsigned, 0, 16>
+align_nl_cont_spaces; // = 1
+
 // Whether to align macro functions and variables together.
 extern Option<bool>
 align_pp_define_together;
@@ -3838,6 +3960,13 @@ mod_remove_extra_semicolon;
 extern Option<bool>
 mod_remove_duplicate_include;
 
+// the following options (mod_XX_closebrace_comment) use different comment,
+// depending of the setting of the next option.
+// false: Use the c comment (default)
+// true : Use the cpp comment
+extern Option<bool>
+mod_add_force_c_closebrace_comment;
+
 // If a function body exceeds the specified number of newlines and doesn't have
 // a comment after the close brace, a comment will be added.
 extern BoundedOption<unsigned, 0, 255>
@@ -4290,6 +4419,10 @@ debug_sort_the_tracks;  // = true
 extern Option<bool>
 debug_decode_the_flags;
 
+// use (or not) the exit(EX_SOFTWARE) function.
+extern Option<bool>
+debug_use_the_exit_function_pop; // = true
+
 // insert the number of the line at the beginning of each line
 extern Option<bool>
 set_numbering_for_html_output;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/options_for_QT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/options_for_QT.cpp
index c0a178f0..c0a178f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/options_for_QT.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/options_for_QT.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/options_for_QT.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/options_for_QT.h
index 1b8bfccf..1b8bfccf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/options_for_QT.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/options_for_QT.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/output.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/output.cpp
index 0914d107..6de21597 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/output.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/output.cpp
@@ -32,14 +32,14 @@ using namespace uncrustify;
 
 struct cmt_reflow
 {
-   Chunk    *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
+   Chunk   *pc         = Chunk::NullChunkPtr;
+   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)
+   UncText cont_text;         //! fixed text to output at the start of a line (0 to 3 chars)
+   bool    reflow = false;    //! reflow the current line
 };
 
 
@@ -89,22 +89,22 @@ void print_numbering()
 static void output_comment_multi(Chunk *pc);
 
 
-static bool kw_fcn_filename(Chunk *cmt, unc_text &out_txt);
+static bool kw_fcn_filename(Chunk *cmt, UncText &out_txt);
 
 
-static bool kw_fcn_class(Chunk *cmt, unc_text &out_txt);
+static bool kw_fcn_class(Chunk *cmt, UncText &out_txt);
 
 
-static bool kw_fcn_message(Chunk *cmt, unc_text &out_txt);
+static bool kw_fcn_message(Chunk *cmt, UncText &out_txt);
 
 
-static bool kw_fcn_category(Chunk *cmt, unc_text &out_txt);
+static bool kw_fcn_category(Chunk *cmt, UncText &out_txt);
 
 
-static bool kw_fcn_scope(Chunk *cmt, unc_text &out_txt);
+static bool kw_fcn_scope(Chunk *cmt, UncText &out_txt);
 
 
-static bool kw_fcn_function(Chunk *cmt, unc_text &out_txt);
+static bool kw_fcn_function(Chunk *cmt, UncText &out_txt);
 
 
 /**
@@ -113,13 +113,13 @@ static bool kw_fcn_function(Chunk *cmt, unc_text &out_txt);
  * If the arg list is '()' or '(void)', then no @params are added.
  * Likewise, if the return value is 'void', then no @return is added.
  */
-static bool kw_fcn_javaparam(Chunk *cmt, unc_text &out_txt);
+static bool kw_fcn_javaparam(Chunk *cmt, UncText &out_txt);
 
 
-static bool kw_fcn_fclass(Chunk *cmt, unc_text &out_txt);
+static bool kw_fcn_fclass(Chunk *cmt, UncText &out_txt);
 
 
-static bool kw_fcn_year(Chunk *cmt, unc_text &out_txt);
+static bool kw_fcn_year(Chunk *cmt, UncText &out_txt);
 
 
 /**
@@ -134,10 +134,10 @@ static void output_comment_multi_simple(Chunk *pc);
 /**
  * This renders the #if condition to a string buffer.
  *
- * @param[out] dst    unc_text buffer to be filled
+ * @param[out] dst    UncText buffer to be filled
  * @param[in]  ifdef  if conditional as chunk list
  */
-static void generate_if_conditional_as_text(unc_text &dst, Chunk *ifdef);
+static void generate_if_conditional_as_text(UncText &dst, Chunk *ifdef);
 
 
 /**
@@ -155,14 +155,14 @@ static void add_char(UINT32 ch, bool is_literal = false);
 static void add_text(const char *ascii_text);
 
 
-static void add_text(const unc_text &text, bool is_ignored, bool is_literal);
+static void add_text(const UncText &text, bool is_ignored, bool is_literal);
 
 
 /**
  * Count the number of characters to the end of the next chunk of text.
  * If it exceeds the limit, return true.
  */
-static bool next_word_exceeds_limit(const unc_text &text, size_t idx);
+static bool next_word_exceeds_limit(const UncText &text, size_t idx);
 
 
 /**
@@ -186,7 +186,7 @@ static void cmt_output_indent(size_t brace_col, size_t base_col, size_t column);
  *
  * @return 0: not present, >0: number of chars that are part of the lead
  */
-static size_t cmt_parse_lead(const unc_text &line, bool is_last);
+static size_t cmt_parse_lead(const UncText &line, bool is_last);
 
 
 /**
@@ -216,10 +216,10 @@ static size_t cmt_parse_lead(const unc_text &line, bool is_last);
  *
  * @return cmt.xtra_indent is set to 0 or 1
  */
-static void calculate_comment_body_indent(cmt_reflow &cmt, const unc_text &str);
+static void calculate_comment_body_indent(cmt_reflow &cmt, const UncText &str);
 
 
-static int next_up(const unc_text &text, size_t idx, const unc_text &tag);
+static int next_up(const UncText &text, size_t idx, const UncText &tag);
 
 
 /**
@@ -240,7 +240,7 @@ static Chunk *output_comment_c(Chunk *pc);
 static Chunk *output_comment_cpp(Chunk *pc);
 
 
-static void cmt_trim_whitespace(unc_text &line, bool in_preproc);
+static void cmt_trim_whitespace(UncText &line, bool in_preproc);
 
 
 /**
@@ -255,7 +255,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, size_t continuation_indent = 0);
+static void add_comment_text(const UncText &text, cmt_reflow &cmt, bool esc_close, size_t continuation_indent = 0);
 
 
 static void output_cmt_start(cmt_reflow &cmt, Chunk *pc);
@@ -391,7 +391,7 @@ static void add_text(const char *ascii_text)
 }
 
 
-static void add_text(const unc_text &text, bool is_ignored = false, bool is_literal = false)
+static void add_text(const UncText &text, bool is_ignored = false, bool is_literal = false)
 {
    for (size_t idx = 0; idx < text.size(); idx++)
    {
@@ -409,10 +409,8 @@ 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)
+static bool next_word_exceeds_limit(const UncText &text, size_t idx)
 {
-   LOG_FMT(LCONTTEXT, "%s(%d): idx is %zu\n",
-           __func__, __LINE__, idx);
    size_t length = 0;
 
    // Count any whitespace
@@ -430,7 +428,10 @@ static bool next_word_exceeds_limit(const unc_text &text, size_t idx)
       idx++;
       length++;
    }
-   return((cpd.column + length - 1) > options::cmt_width());
+   bool exceed_limit = (cpd.column + length - 1) > options::cmt_width();
+   LOG_FMT(LCONTTEXT, "%s(%d): idx is %zu%s\n",
+           __func__, __LINE__, idx, (exceed_limit ? " exceeds limit" : ""));
+   return(exceed_limit);
 }
 
 
@@ -535,7 +536,7 @@ void output_parsed(FILE *pfile, bool withOptions)
               pc->GetBraceLevel(), pc->GetLevel(), pc->GetPpLevel());
       // Print pc flags in groups of 4 hex characters
       char flag_string[24];
-      sprintf(flag_string, "%16llx", static_cast<T_PcfFlags::int_t>(pc->GetFlags()));
+      sprintf(flag_string, "%16llx", static_cast<PcfFlags::int_t>(pc->GetFlags()));
       fprintf(pfile, "[%.4s %.4s %.4s %.4s]", flag_string, flag_string + 4, flag_string + 8, flag_string + 12);
       fprintf(pfile, "[%zu-%d]",
               pc->GetNlCount(), pc->GetAfterTab());
@@ -639,7 +640,7 @@ void output_parsed_csv(FILE *pfile)
 
 
 // Compares two tracks according to second in descending order.
-bool compareTrack(Track_nr t1, Track_nr t2)
+bool compareTrack(TrackNumber t1, TrackNumber t2)
 {
    char *t1s          = t1.second;
    char *t2s          = t2.second;
@@ -764,16 +765,14 @@ void output_text(FILE *pfile)
                else
                {
                   // Try to keep the same relative spacing
-                  while (  prev != nullptr
-                        && prev->IsNotNullChunk()
+                  while (  prev->IsNotNullChunk()
                         && prev->GetOrigCol() == 0
                         && prev->GetNlCount() == 0)
                   {
                      prev = prev->GetPrev();
                   }
 
-                  if (  prev != nullptr
-                     && prev->IsNotNullChunk()
+                  if (  prev->IsNotNullChunk()
                      && prev->GetNlCount() == 0)
                   {
                      int orig_sp = pc->GetOrigPrevSp();
@@ -838,7 +837,8 @@ void output_text(FILE *pfile)
             output_comment_multi_simple(pc);
          }
       }
-      else if (pc->Is(CT_COMMENT_CPP))
+      else if (  pc->Is(CT_COMMENT_CPP)
+              || pc->Is(CT_COMMENT_CPP_ENDIF))
       {
          log_rule_B("cmt_comment_cpp");
          log_rule_B("cmt_convert_tab_to_spaces - comment_cpp");
@@ -854,7 +854,8 @@ void output_text(FILE *pfile)
          pc                    = output_comment_cpp(pc);
          cpd.output_trailspace = tmp;
       }
-      else if (pc->Is(CT_COMMENT))
+      else if (  pc->Is(CT_COMMENT)
+              || pc->Is(CT_COMMENT_ENDIF))
       {
          log_rule_B("cmt_comment");
          log_rule_B("cmt_convert_tab_to_spaces - comment");
@@ -1025,10 +1026,10 @@ void output_text(FILE *pfile)
             // protocol before sort
             for (size_t track = 0; track < pc->GetTrackingData()->size(); track++)
             {
-               const track_list *A       = pc->GetTrackingData();
-               const Track_nr   B        = A->at(track);
-               size_t           Bfirst   = B.first;
-               char             *Bsecond = B.second;
+               const TrackList   *A       = pc->GetTrackingData();
+               const TrackNumber 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);
@@ -1037,17 +1038,17 @@ void output_text(FILE *pfile)
 
             if (options::debug_sort_the_tracks())
             {
-               track_list *A1 = pc->TrackingData();
+               TrackList *A1 = pc->TrackingData();
                sort(A1->begin(), A1->end(), compareTrack);
             }
 #ifdef EXTRA_LOG
             // protocol after sort
             for (size_t track = 0; track < pc->GetTrackingData()->size(); track++)
             {
-               const track_list *A       = pc->GetTrackingData();
-               const Track_nr   B        = A->at(track);
-               size_t           Bfirst   = B.first;
-               char             *Bsecond = B.second;
+               const TrackList   *A       = pc->GetTrackingData();
+               const TrackNumber 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);
@@ -1058,11 +1059,11 @@ void output_text(FILE *pfile)
 
          for (size_t track = 0; track < pc->GetTrackingData()->size(); track++)
          {
-            const track_list *A         = pc->GetTrackingData();
-            const Track_nr   B          = A->at(track);
-            size_t           Bfirst     = B.first;
-            char             *Bsecond   = B.second;
-            bool             first_text = true;
+            const TrackList   *A         = pc->GetTrackingData();
+            const TrackNumber B          = A->at(track);
+            size_t            Bfirst     = B.first;
+            char              *Bsecond   = B.second;
+            bool              first_text = true;
 
             if (  old_one == nullptr
                || strcmp(old_one, Bsecond) != 0)
@@ -1092,7 +1093,7 @@ void output_text(FILE *pfile)
 
          add_text("\"><font color=\"red\">M</font></a>");
          write_in_tracking = true;
-      } // if (pc->GetTrackingData() != nullptr)
+      }
    } // loop over the whole chunk list
 
    if (tracking)
@@ -1105,53 +1106,7 @@ void output_text(FILE *pfile)
 } // output_text
 
 
-void dump_step(const char *filename, const char *step_description)
-{
-   static int file_num = 0;
-   char       buffer[256];
-   FILE       *dump_file;
-
-   if (  filename == nullptr
-      || strlen(filename) == 0)
-   {
-      return;
-   }
-
-   // On the first call, also save the options in use
-   if (file_num == 0)
-   {
-      snprintf(buffer, 256, "New dump file: %s_%03d.log - Options in use", filename, file_num);
-      log_rule_B(buffer);
-
-      snprintf(buffer, 256, "%s_%03d.log", filename, file_num);
-      ++file_num;
-
-      dump_file = fopen(buffer, "wb");
-
-      if (dump_file != nullptr)
-      {
-         save_option_file(dump_file, false, true);
-         fclose(dump_file);
-      }
-   }
-   snprintf(buffer, 256, "New dump file: %s_%03d.log - %s", filename, file_num, step_description);
-   log_rule_B(buffer);
-
-   snprintf(buffer, 256, "%s_%03d.log", filename, file_num);
-   ++file_num;
-
-   dump_file = fopen(buffer, "wb");
-
-   if (dump_file != nullptr)
-   {
-      fprintf(dump_file, "STEP: %s\n--------------\n", step_description);
-      output_parsed(dump_file, false);
-      fclose(dump_file);
-   }
-} // dump_step
-
-
-static size_t cmt_parse_lead(const unc_text &line, bool is_last)
+static size_t cmt_parse_lead(const UncText &line, bool is_last)
 {
    size_t len = 0;
 
@@ -1422,7 +1377,7 @@ static void calculate_doxygen_javadoc_indent_alignment(const std::wstring &str,
 } // calculate_doxygen_javadoc_indent_alignment
 
 
-static void calculate_comment_body_indent(cmt_reflow &cmt, const unc_text &str)
+static void calculate_comment_body_indent(cmt_reflow &cmt, const UncText &str)
 {
    cmt.xtra_indent = 0;
 
@@ -1557,11 +1512,6 @@ static void calculate_comment_body_indent(cmt_reflow &cmt, const unc_text &str)
 // TODO: can we use search_next_chunk here?
 static Chunk *get_next_function(Chunk *pc)
 {
-   if (pc == nullptr)
-   {
-      pc = Chunk::NullChunkPtr;
-   }
-
    while ((pc = pc->GetNext())->IsNotNullChunk())
    {
       if (  pc->Is(CT_FUNC_DEF)
@@ -1573,7 +1523,7 @@ static Chunk *get_next_function(Chunk *pc)
          return(pc);
       }
    }
-   return(nullptr);
+   return(Chunk::NullChunkPtr);
 }
 
 
@@ -1601,7 +1551,7 @@ static Chunk *get_prev_oc_class(Chunk *pc)
 }
 
 
-static int next_up(const unc_text &text, size_t idx, const unc_text &tag)
+static int next_up(const UncText &text, size_t idx, const UncText &tag)
 {
    size_t offs = 0;
 
@@ -1620,10 +1570,10 @@ static int next_up(const unc_text &text, size_t idx, const unc_text &tag)
 }
 
 
-static void add_comment_text(const unc_text &text,
-                             cmt_reflow     &cmt,
-                             bool           esc_close,
-                             size_t         continuation_indent)
+static void add_comment_text(const UncText &text,
+                             cmt_reflow    &cmt,
+                             bool          esc_close,
+                             size_t        continuation_indent)
 {
    bool   was_star  = false;
    bool   was_slash = false;
@@ -1789,7 +1739,7 @@ static void output_cmt_start(cmt_reflow &cmt, Chunk *pc)
    // Issue #2752
    log_rule_B("cmt_insert_file_header");
    log_rule_B("cmt_insert_file_footer");
-   log_rule_B("cmt_insert_func_header)");
+   log_rule_B("cmt_insert_func_header");
    log_rule_B("cmt_insert_class_header");
    log_rule_B("cmt_insert_oc_msg_header");
 
@@ -1907,16 +1857,31 @@ static Chunk *output_comment_c(Chunk *first)
       cmt.cont_text = options::cmt_star_cont() ? " * " : "   ";
       LOG_CONTTEXT();
 
-      log_rule_B("cmt_trailing_single_line_c_to_cpp");
+      bool replace_comment = (  options::cmt_trailing_single_line_c_to_cpp()
+                             && first->IsLastChunkOnLine()
+                             && first->Str().at(2) != '*');
 
-      if (options::cmt_trailing_single_line_c_to_cpp() && first->IsLastChunkOnLine())
+      if (  replace_comment
+         && first->TestFlags(PCF_IN_PREPROC))
       {
-         add_text("//");
+         // Do not replace a single line comment if we are inside a #define line
+         if (first->GetPpStart()->GetParentType() == CT_PP_DEFINE)
+         {
+            replace_comment = false;
+         }
+      }
 
-         unc_text tmp;
-         tmp.set(first->GetStr(), 2, first->Len() - 4);
+      if (replace_comment)
+      {
+         // Transform the comment to CPP and reuse the same logic (issue #4121)
+         log_rule_B("cmt_trailing_single_line_c_to_cpp");
+
+         UncText tmp(first->GetStr(), 0, first->Len() - 2);
+         tmp.at(1) = '/'; // Change '/*' to '//'
          cmt_trim_whitespace(tmp, false);
-         add_comment_text(tmp, cmt, false);
+         first->Str() = tmp;
+
+         output_comment_cpp(first);
       }
       else
       {
@@ -1936,8 +1901,8 @@ static Chunk *output_comment_c(Chunk *first)
    {
       add_comment_text("\n", cmt, false);
    }
-   Chunk    *pc = first;
-   unc_text tmp;
+   Chunk   *pc = first;
+   UncText tmp;
 
    while (can_combine_comment(pc, cmt))
    {
@@ -1995,7 +1960,7 @@ static Chunk *output_comment_cpp(Chunk *first)
    log_rule_B("cmt_reflow_mode");
    cmt.reflow = (options::cmt_reflow_mode() != 1);
 
-   unc_text leadin = "//";             // default setting to keep previous behaviour
+   UncText leadin = "//";             // default setting to keep previous behaviour
 
    // If true, space is added with sp_cmt_cpp_start will be added after doxygen
    // sequences like '///', '///<', '//!' and '//!<'.
@@ -2099,8 +2064,8 @@ static Chunk *output_comment_cpp(Chunk *first)
       }
       else
       {
-         size_t   iLISz = leadin.size();
-         unc_text tmp(first->GetStr(), 0, iLISz);
+         size_t  iLISz = leadin.size();
+         UncText tmp(first->GetStr(), 0, iLISz);
          add_comment_text(tmp, cmt, false);
 
          tmp.set(first->GetStr(), iLISz, first->Len() - iLISz);
@@ -2129,7 +2094,26 @@ static Chunk *output_comment_cpp(Chunk *first)
                if (  !unc_isspace(tmp[0])
                   && (tmp[0] != '/'))
                {
-                  add_comment_text(" ", cmt, false);
+                  // only with sp_cmt_cpp_start set to 'add' or 'force'
+                  bool    sp_cmt_pvs  = options::sp_cmt_cpp_pvs();  // Issue #3919
+                  bool    sp_cmt_lint = options::sp_cmt_cpp_lint(); // Issue #3614
+                  UncText temp        = first->GetStr();
+                  int     PVS         = temp.find("//-V");
+                  int     LINT        = temp.find("//lint");
+
+                  // @return == -1 if not found
+                  // @return >=  0 the position
+                  if (  (  PVS == 0
+                        && sp_cmt_pvs)
+                     || (  LINT == 0
+                        && sp_cmt_lint))
+                  {
+                     // do not include a space
+                  }
+                  else
+                  {
+                     add_comment_text(" ", cmt, false);
+                  }
                }
             }
             add_comment_text(tmp, cmt, false);
@@ -2142,7 +2126,7 @@ static Chunk *output_comment_cpp(Chunk *first)
    cmt.cont_text = options::cmt_star_cont() ? " * " : "   ";
    LOG_CONTTEXT();
 
-   unc_text tmp;
+   UncText tmp;
 
    // See if we can combine this comment with the next comment
    log_rule_B("cmt_cpp_group");
@@ -2214,7 +2198,7 @@ static Chunk *output_comment_cpp(Chunk *first)
 } // output_comment_cpp
 
 
-static void cmt_trim_whitespace(unc_text &line, bool in_preproc)
+static void cmt_trim_whitespace(UncText &line, bool in_preproc)
 {
    // Remove trailing whitespace on the line
    while (  line.size() > 0
@@ -2341,12 +2325,12 @@ static void output_comment_multi(Chunk *pc)
                                               doxygen_javadoc_param_name_indent,
                                               doxygen_javadoc_continuation_indent);
 
-   size_t   line_count                   = 0;
-   size_t   ccol                         = pc->GetColumn(); // the col of subsequent comment lines
-   size_t   cmt_idx                      = 0;
-   bool     nl_end                       = false;
-   bool     doxygen_javadoc_indent_align = false;
-   unc_text line;
+   size_t  line_count                   = 0;
+   size_t  ccol                         = pc->GetColumn();  // the col of subsequent comment lines
+   size_t  cmt_idx                      = 0;
+   bool    nl_end                       = false;
+   bool    doxygen_javadoc_indent_align = false;
+   UncText line;
 
    /*
     * Get a map of regex pairs that define expressions to match at both the end
@@ -2375,10 +2359,10 @@ static void output_comment_multi(Chunk *pc)
       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->GetStr(),
-                                disable_processing_cmt_idx,
-                                length);
+         auto    length = enable_processing_cmt_idx - disable_processing_cmt_idx;
+         UncText verbatim_text(pc->GetStr(),
+                               disable_processing_cmt_idx,
+                               length);
 
          add_text(verbatim_text);
 
@@ -2746,7 +2730,7 @@ static void output_comment_multi(Chunk *pc)
                   }
                   // 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);
+                  UncText tmp = UncText(cmt.cont_text);
                   cmt_trim_whitespace(tmp, false);
                   add_text(tmp);
                }
@@ -2863,7 +2847,7 @@ static void output_comment_multi(Chunk *pc)
 } // output_comment_multi
 
 
-static bool kw_fcn_filename(Chunk *cmt, unc_text &out_txt)
+static bool kw_fcn_filename(Chunk *cmt, UncText &out_txt)
 {
    UNUSED(cmt);
    out_txt.append(path_basename(cpd.filename.c_str()));
@@ -2871,7 +2855,7 @@ static bool kw_fcn_filename(Chunk *cmt, unc_text &out_txt)
 }
 
 
-static bool kw_fcn_class(Chunk *cmt, unc_text &out_txt)
+static bool kw_fcn_class(Chunk *cmt, UncText &out_txt)
 {
    Chunk *tmp = Chunk::NullChunkPtr;
 
@@ -2879,8 +2863,7 @@ static bool kw_fcn_class(Chunk *cmt, unc_text &out_txt)
    {
       Chunk *fcn = get_next_function(cmt);
 
-      if (  fcn != nullptr
-         && fcn->Is(CT_OC_MSG_DECL))
+      if (fcn->Is(CT_OC_MSG_DECL))
       {
          tmp = get_prev_oc_class(cmt);
       }
@@ -2923,11 +2906,11 @@ static bool kw_fcn_class(Chunk *cmt, unc_text &out_txt)
 } // kw_fcn_class
 
 
-static bool kw_fcn_message(Chunk *cmt, unc_text &out_txt)
+static bool kw_fcn_message(Chunk *cmt, UncText &out_txt)
 {
    Chunk *fcn = get_next_function(cmt);
 
-   if (fcn == nullptr)
+   if (fcn->IsNullChunk())
    {
       return(false);
    }
@@ -2964,7 +2947,7 @@ static bool kw_fcn_message(Chunk *cmt, unc_text &out_txt)
 } // kw_fcn_message
 
 
-static bool kw_fcn_category(Chunk *cmt, unc_text &out_txt)
+static bool kw_fcn_category(Chunk *cmt, UncText &out_txt)
 {
    Chunk *category = get_prev_category(cmt);
 
@@ -2978,7 +2961,7 @@ static bool kw_fcn_category(Chunk *cmt, unc_text &out_txt)
 } // kw_fcn_category
 
 
-static bool kw_fcn_scope(Chunk *cmt, unc_text &out_txt)
+static bool kw_fcn_scope(Chunk *cmt, UncText &out_txt)
 {
    Chunk *scope = get_next_scope(cmt);
 
@@ -2991,11 +2974,11 @@ static bool kw_fcn_scope(Chunk *cmt, unc_text &out_txt)
 } // kw_fcn_scope
 
 
-static bool kw_fcn_function(Chunk *cmt, unc_text &out_txt)
+static bool kw_fcn_function(Chunk *cmt, UncText &out_txt)
 {
    Chunk *fcn = get_next_function(cmt);
 
-   if (fcn != nullptr)
+   if (fcn->IsNotNullChunk())
    {
       if (fcn->GetParentType() == CT_OPERATOR)
       {
@@ -3013,11 +2996,11 @@ static bool kw_fcn_function(Chunk *cmt, unc_text &out_txt)
 }
 
 
-static bool kw_fcn_javaparam(Chunk *cmt, unc_text &out_txt)
+static bool kw_fcn_javaparam(Chunk *cmt, UncText &out_txt)
 {
    Chunk *fcn = get_next_function(cmt);
 
-   if (fcn == nullptr)
+   if (fcn->IsNullChunk())
    {
       return(false);
    }
@@ -3158,7 +3141,7 @@ static bool kw_fcn_javaparam(Chunk *cmt, unc_text &out_txt)
 } // kw_fcn_javaparam
 
 
-static bool kw_fcn_fclass(Chunk *cmt, unc_text &out_txt)
+static bool kw_fcn_fclass(Chunk *cmt, UncText &out_txt)
 {
    Chunk *fcn = get_next_function(cmt);
 
@@ -3218,7 +3201,7 @@ static bool kw_fcn_fclass(Chunk *cmt, unc_text &out_txt)
 } // kw_fcn_fclass
 
 
-static bool kw_fcn_year(Chunk *cmt, unc_text &out_txt)
+static bool kw_fcn_year(Chunk *cmt, UncText &out_txt)
 {
    UNUSED(cmt);
    time_t now = time(nullptr);
@@ -3231,7 +3214,7 @@ static bool kw_fcn_year(Chunk *cmt, unc_text &out_txt)
 struct kw_subst_t
 {
    const char *tag;
-   bool       (*func)(Chunk *cmt, unc_text &out_txt);
+   bool       (*func)(Chunk *cmt, UncText &out_txt);
 };
 
 
@@ -3259,7 +3242,7 @@ static void do_kw_subst(Chunk *pc)
       {
          continue;
       }
-      unc_text tmp_txt;
+      UncText tmp_txt;
       tmp_txt.clear();
 
       if (kw.func(pc, tmp_txt))
@@ -3272,7 +3255,7 @@ static void do_kw_subst(Chunk *pc)
             if (nl_idx > 0)
             {
                // idx and nl_idx are both positive
-               unc_text nl_txt;
+               UncText nl_txt;
                nl_txt.append("\n");
                nl_idx++;
 
@@ -3324,13 +3307,13 @@ static void output_comment_multi_simple(Chunk *pc)
     * 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->GetStr());
-   auto     enable_processing_cmt_idx  = find_enable_processing_comment_marker(pc->GetStr());
+   auto    disable_processing_cmt_idx = find_disable_processing_comment_marker(pc->GetStr());
+   auto    enable_processing_cmt_idx  = find_enable_processing_comment_marker(pc->GetStr());
 
-   unc_text line;
-   size_t   line_count  = 0;
-   size_t   line_column = pc->GetColumn();
-   size_t   cmt_idx     = 0;
+   UncText line;
+   size_t  line_count  = 0;
+   size_t  line_column = pc->GetColumn();
+   size_t  cmt_idx     = 0;
 
    while (cmt_idx < pc->Len())
    {
@@ -3340,10 +3323,10 @@ static void output_comment_multi_simple(Chunk *pc)
       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->GetStr(),
-                                disable_processing_cmt_idx,
-                                length);
+         auto    length = enable_processing_cmt_idx - disable_processing_cmt_idx;
+         UncText verbatim_text(pc->GetStr(),
+                               disable_processing_cmt_idx,
+                               length);
 
          add_text(verbatim_text);
 
@@ -3446,7 +3429,7 @@ static void output_comment_multi_simple(Chunk *pc)
 } // output_comment_multi_simple
 
 
-static void generate_if_conditional_as_text(unc_text &dst, Chunk *ifdef)
+static void generate_if_conditional_as_text(UncText &dst, Chunk *ifdef)
 {
    int column = -1;
 
@@ -3575,7 +3558,7 @@ void add_long_preprocessor_conditional_block_comment()
                   E_Token style = (language_is_set(LANG_CPP)) ?
                                   CT_COMMENT_CPP : CT_COMMENT;
 
-                  unc_text str;
+                  UncText str;
                   generate_if_conditional_as_text(str, br_open);
 
                   LOG_FMT(LPPIF, "#if / %s section over threshold %zu (new line count=%zu) --> insert comment after the %s: %s\n",
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/output.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/output.h
index f3f6026e..1d55c8c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/output.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/output.h
@@ -1,6 +1,6 @@
 /**
  * @file output.h
- * prototypes for output.c
+ * prototypes for output.cpp
  *
  * @author  Ben Gardner
  * @license GPL v2+
@@ -26,10 +26,6 @@ void output_parsed_csv(FILE *pfile);
 void output_text(FILE *pfile);
 
 
-//! This save the next formatting step to a file
-void dump_step(const char *filename, const char *description);
-
-
 /**
  * See also it's preprocessor counterpart
  *   add_long_closebrace_comment
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parameter_pack_cleanup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parameter_pack_cleanup.cpp
index 12992ff3..12992ff3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parameter_pack_cleanup.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parameter_pack_cleanup.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parameter_pack_cleanup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parameter_pack_cleanup.h
index e3aa31ac..e3aa31ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parameter_pack_cleanup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parameter_pack_cleanup.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parens.cpp
index 67d75a6e..18b69210 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parens.cpp
@@ -50,8 +50,7 @@ void do_parens()
    {
       Chunk *pc = Chunk::GetHead();
 
-      while (  (pc = pc->GetNextNcNnl()) != nullptr
-            && pc->IsNotNullChunk())
+      while ((pc = pc->GetNextNcNnl())->IsNotNullChunk())
       {
          if (  pc->IsNot(CT_SPAREN_OPEN)
             || (  pc->GetParentType() != CT_IF
@@ -85,13 +84,16 @@ void do_parens_assign()                         // Issue #3316
    {
       Chunk *pc = Chunk::GetHead();
 
-      while (  (pc = pc->GetNextNcNnl()) != nullptr
-            && pc->IsNotNullChunk())
+      while ((pc = pc->GetNextNcNnl())->IsNotNullChunk())
       {
          if (pc->Is(CT_ASSIGN))
          {
-            LOG_FMT(LPARADD, "%s(%d): orig line is %zu, text is '%s', level is %zu\n",
-                    __func__, __LINE__, pc->GetOrigLine(), pc->Text(), pc->GetLevel());
+            if (pc->TestFlags(PCF_IN_SPAREN))            // Issue #4239
+            {
+               continue;
+            }
+            LOG_FMT(LPARADD, "%s(%d): orig line is %zu, orig col is %zu, text is '%s', level is %zu\n",
+                    __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), pc->GetLevel());
             // look before for a open sparen
             size_t check_level = pc->GetLevel();
             Chunk  *p          = pc->GetPrevNc(E_Scope::PREPROC);
@@ -156,8 +158,7 @@ void do_parens_return()                         // Issue #3316
    {
       Chunk *pc = Chunk::GetHead();
 
-      while (  (pc = pc->GetNextNcNnl()) != nullptr
-            && pc->IsNotNullChunk())
+      while ((pc = pc->GetNextNcNnl())->IsNotNullChunk())
       {
          if (pc->Is(CT_RETURN))
          {
@@ -219,9 +220,11 @@ static void add_parens_between(Chunk *first, Chunk *last)
 {
    LOG_FUNC_ENTRY();
 
-   LOG_FMT(LPARADD, "%s(%d): line %zu, between '%s' [lvl is %zu] and '%s' [lvl is %zu]\n",
-           __func__, __LINE__, first->GetOrigLine(),
-           first->Text(), first->GetLevel(),
+   LOG_FMT(LPARADD, "%s(%d): first: line %zu, col %zu, between '%s' [lvl is %zu] and\n",
+           __func__, __LINE__, first->GetOrigLine(), first->GetOrigCol(),
+           first->Text(), first->GetLevel());
+   LOG_FMT(LPARADD, "%s(%d): last: line %zu, col %zu, '%s' [lvl is %zu]\n",
+           __func__, __LINE__, last->GetOrigLine(), last->GetOrigCol(),
            last->Text(), last->GetLevel());
 
    // Don't do anything if we have a bad sequence, ie "&& )"
@@ -235,36 +238,43 @@ static void add_parens_between(Chunk *first, Chunk *last)
 
    pc.SetType(CT_PAREN_OPEN);
    pc.SetOrigLine(first_n->GetOrigLine());
-   pc.SetOrigCol(first_n->GetOrigCol());
+   pc.SetColumn(first_n->GetColumn());                         // Issue #3236
+   pc.SetOrigCol(first_n->GetOrigCol());                       // Issue #3236
+   pc.SetOrigColEnd(first_n->GetOrigColEnd());                 // Issue #3236
    pc.Str() = "(";
    pc.SetFlags(first_n->GetFlags() & PCF_COPY_FLAGS);
    pc.SetLevel(first_n->GetLevel());
    pc.SetPpLevel(first_n->GetPpLevel());
    pc.SetBraceLevel(first_n->GetBraceLevel());
-
    pc.CopyAndAddBefore(first_n);
 
-   Chunk *last_p = last->GetPrevNcNnl(E_Scope::PREPROC);
+   shift_the_rest_of_the_line(first_n);                         // Issue #3236
+
+   Chunk *last_prev = last->GetPrevNcNnl(E_Scope::PREPROC);
 
    pc.SetType(CT_PAREN_CLOSE);
-   pc.SetOrigLine(last_p->GetOrigLine());
-   pc.SetOrigCol(last_p->GetOrigCol());
+   pc.SetOrigLine(last_prev->GetOrigLine());
+   pc.SetOrigCol(last_prev->GetOrigCol());
+   pc.SetColumn(last_prev->GetColumn() + 1);                         // Issue #3236
+   pc.SetOrigCol(last_prev->GetOrigCol() + 1);                       // Issue #3236
+   pc.SetOrigColEnd(last_prev->GetOrigColEnd() + 1);                 // Issue #3236
    pc.Str() = ")";
-   pc.SetFlags(last_p->GetFlags() & PCF_COPY_FLAGS);
-   pc.SetLevel(last_p->GetLevel());
-   pc.SetPpLevel(last_p->GetPpLevel());
-   pc.SetBraceLevel(last_p->GetBraceLevel());
+   pc.SetFlags(last_prev->GetFlags() & PCF_COPY_FLAGS);
+   pc.SetLevel(last_prev->GetLevel());
+   pc.SetPpLevel(last_prev->GetPpLevel());
+   pc.SetBraceLevel(last_prev->GetBraceLevel());
+   pc.CopyAndAddAfter(last_prev);
 
-   pc.CopyAndAddAfter(last_p);
+   shift_the_rest_of_the_line(last);                         // Issue #3236
 
    for (Chunk *tmp = first_n;
-        tmp != last_p;
+        tmp != last_prev;
         tmp = tmp->GetNextNcNnl())
    {
       tmp->SetLevel(tmp->GetLevel() + 1);
    }
 
-   last_p->SetLevel(last_p->GetLevel() + 1);
+   last_prev->SetLevel(last_prev->GetLevel() + 1);
 } // add_parens_between
 
 
@@ -283,8 +293,7 @@ static void check_bool_parens(Chunk *popen, Chunk *pclose, int nest)
 
    Chunk *pc = popen;
 
-   while (  (pc = pc->GetNextNcNnl()) != nullptr
-         && pc->IsNotNullChunk()
+   while (  (pc = pc->GetNextNcNnl())->IsNotNullChunk()
          && pc != pclose)
    {
       if (pc->TestFlags(PCF_IN_PREPROC))
@@ -331,6 +340,10 @@ static void check_bool_parens(Chunk *popen, Chunk *pclose, int nest)
             pc = next;
          }
       }
+      else if (pc->Is(CT_SEMICOLON))                      // Issue #3236
+      {
+         ref = pc;
+      }
       else if (  pc->Is(CT_BRACE_OPEN)
               || pc->Is(CT_SQUARE_OPEN)
               || pc->Is(CT_ANGLE_OPEN))
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parens.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parens.h
index cfcb9501..f3c6fe87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parens.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parens.h
@@ -1,6 +1,6 @@
 /**
  * @file parens.h
- * prototypes for parens.c
+ * prototypes for parens.cpp
  *
  * @author  Ben Gardner
  * @license GPL v2+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parent_for_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parent_for_pp.cpp
index f731b9f7..f731b9f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parent_for_pp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parent_for_pp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parent_for_pp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parent_for_pp.h
index 7e77700a..7e77700a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/parent_for_pp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parent_for_pp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parsing_frame.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parsing_frame.cpp
new file mode 100644
index 00000000..f91ecbf4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parsing_frame.cpp
@@ -0,0 +1,256 @@
+/**
+ * @file parsing_frame.cpp
+ *
+ * Holds data needed for indenting and brace parsing
+ *
+ * @author  Daniel Chumak
+ * @license GPL v2+
+ */
+
+#include "parsing_frame.h"
+
+#include "chunk.h"
+#include "options.h"
+#include "uncrustify.h"
+
+#include <stdexcept>            // to get std::logic_error
+
+
+using std::string;
+using std::to_string;
+using std::invalid_argument;
+
+
+ParenStackEntry::ParenStackEntry()
+{
+   m_openToken       = CT_EOF;
+   m_openChunk       = Chunk::NullChunkPtr;
+   m_openLevel       = 0;
+   m_openLine        = 0;
+   m_openCol         = 0;
+   m_braceIndent     = 0;
+   m_indent          = 1;
+   m_indentTmp       = 1;
+   m_indentTab       = 1;
+   m_nsCount         = 0;
+   m_indentContinue  = false;
+   m_inPreproc       = false;
+   m_nonVardef       = false;
+   m_parent          = CT_NONE;
+   m_stage           = E_BraceStage::NONE;
+   m_indentationData = { Chunk::NullChunkPtr, 0 };
+   m_popChunk        = Chunk::NullChunkPtr;
+}
+
+
+ParsingFrame::ParsingFrame()
+{
+   //! amount of elements for which memory is going to be pre-initialized
+   static constexpr int CONTAINER_INIT_SIZE = 16;
+
+   m_parenStack = std::vector<ParenStackEntry>();
+   m_parenStack.reserve(CONTAINER_INIT_SIZE);
+   m_parenStack.push_back(ParenStackEntry());
+
+   m_lastPopped  = ParenStackEntry();
+   m_refNumber   = 0;
+   m_parenLevel  = 0;
+   m_braceLevel  = 0;
+   m_ppLevel     = 0;
+   m_sParenCount = 0;
+   m_parenCount  = 0;
+   m_ifdefType   = E_Token::CT_NONE;
+   m_stmtCount   = 0;
+   m_exprCount   = 0;
+}
+
+
+ParenStackEntry &ParsingFrame::prev(size_t idx)
+{
+   LOG_FUNC_ENTRY();
+
+   if (idx == 0)
+   {
+      throw invalid_argument(string(__FILE__) + ":" + to_string(__LINE__)
+                             + " idx can't be zero");
+   }
+
+   if (idx >= m_parenStack.size())
+   {
+      LOG_FMT(LINDPSE, "%s(%d): idx is %zu, size is %zu\n",
+              __func__, __LINE__, idx, m_parenStack.size());
+      throw invalid_argument(string(__FILE__) + ":" + to_string(__LINE__)
+                             + " idx can't be >= size()");
+   }
+   return(*std::prev(std::end(m_parenStack), idx + 1));
+}
+
+
+const ParenStackEntry &ParsingFrame::prev(size_t idx) const
+{
+   LOG_FUNC_ENTRY();
+   // Reuse the code from non-const method
+   return((const_cast<ParsingFrame *>(this))->prev(idx));
+}
+
+
+ParenStackEntry &ParsingFrame::top()
+{
+   // always at least one (dummy) element inside m_parenStack guaranteed
+   return(*std::prev(std::end(m_parenStack)));
+}
+
+
+const ParenStackEntry &ParsingFrame::top() const
+{
+   // always at least one (dummy) element inside m_parenStack guaranteed
+   return(*std::prev(std::end(m_parenStack)));
+}
+
+
+void ParsingFrame::push(Chunk *pc, const char *func, int line, E_BraceStage stage)
+{
+   LOG_FUNC_ENTRY();
+
+   ParenStackEntry new_entry;
+
+   if (pc->IsNotNullChunk())
+   {
+      new_entry.SetOpenToken(pc->GetType());
+      new_entry.SetOpenLevel(pc->GetLevel());
+      new_entry.SetOpenLine(pc->GetOrigLine());
+      new_entry.SetOpenCol(pc->GetOrigCol());
+      new_entry.SetOpenChunk(pc);
+
+      new_entry.SetIndentTab(top().GetIndentTab());
+      new_entry.SetIndentContinue(top().GetIndentContinue());
+      new_entry.SetStage(stage);
+
+      new_entry.SetInPreproc(pc->TestFlags(PCF_IN_PREPROC));
+      new_entry.SetNonVardef(false);
+      new_entry.IndentData() = top().GetIndentData();
+      new_entry.SetPopChunk(Chunk::NullChunkPtr);
+   }
+   m_parenStack.push_back(new_entry);
+
+// uncomment the line below to get the address of the m_parenStack
+// #define DEBUG_PUSH_POP
+#ifdef DEBUG_PUSH_POP
+   LOG_FMT(LINDPSE, "ParsingFrame::push(%s:%d) Add is %4zu: orig line is %4zu, orig col is %4zu, type is %12s, "
+           "brace level is %2zu, level is %2zu, pse_tos: %2zu -> %2zu\n",
+           func, line, (size_t)this, pc->GetOrigLine(), pc->GetOrigCol(),
+           get_token_name(pc->GetType()), pc->GetBraceLevel(), pc->GetLevel(),
+           (m_parenStack.size() - 2), (m_parenStack.size() - 1));
+#else /* DEBUG_PUSH_POP */
+   LOG_FMT(LINDPSE, "ParsingFrame::push(%s:%d): orig line is %4zu, orig col is %4zu, type is %12s, "
+           "brace level is %2zu, level is %2zu, pse_tos: %2zu -> %2zu\n",
+           func, line, pc->GetOrigLine(), pc->GetOrigCol(),
+           get_token_name(pc->GetType()), pc->GetBraceLevel(), pc->GetLevel(),
+           (m_parenStack.size() - 2), (m_parenStack.size() - 1));
+#endif /* DEBUG_PUSH_POP */
+}
+
+
+void ParsingFrame::pop(const char *func, int line, Chunk *pc)
+{
+   LOG_FUNC_ENTRY();
+
+   if (  pc->GetType() == CT_ACCESS
+      || pc->GetType() == CT_ANGLE_CLOSE
+      || pc->GetType() == CT_ANGLE_OPEN
+      || pc->GetType() == CT_ARITH                    // Issue #3965
+      || pc->GetType() == CT_ASSIGN
+      || pc->GetType() == CT_ASSIGN_FUNC_PROTO        // Issue #4026
+      || pc->GetType() == CT_BRACE_CLOSE
+      || pc->GetType() == CT_BRACE_OPEN
+      || pc->GetType() == CT_BOOL
+      || pc->GetType() == CT_CASE
+      || pc->GetType() == CT_CLASS_COLON
+      || pc->GetType() == CT_COMMA
+      || pc->GetType() == CT_COMMENT
+      || pc->GetType() == CT_COMMENT_CPP
+      || pc->GetType() == CT_COMMENT_MULTI
+      || pc->GetType() == CT_COMPARE                  // Issue #3915
+      || pc->GetType() == CT_COND_COLON
+      || pc->GetType() == CT_DC_MEMBER                // Issue #4026
+      || pc->GetType() == CT_FPAREN_CLOSE
+      || pc->GetType() == CT_FPAREN_OPEN
+      || pc->GetType() == CT_FUNC_CTOR_VAR            // Issue #4026
+      || pc->GetType() == CT_INCDEC_AFTER             // Issue #4026
+      || pc->GetType() == CT_LPAREN_CLOSE
+      || pc->GetType() == CT_LPAREN_OPEN
+      || pc->GetType() == CT_MACRO_CLOSE
+      || pc->GetType() == CT_MACRO_FUNC_CALL          // Issue #4026
+      || pc->GetType() == CT_MACRO_OPEN
+      || pc->GetType() == CT_MEMBER                   // Issue #3996
+      || pc->GetType() == CT_NEWLINE
+      || pc->GetType() == CT_NONE
+      || pc->GetType() == CT_OC_END
+      || pc->GetType() == CT_OC_MSG_NAME
+      || pc->GetType() == CT_OC_PROPERTY
+      || pc->GetType() == CT_OC_SCOPE
+      || pc->GetType() == CT_OPERATOR                 // Issue #4026
+      || pc->GetType() == CT_PARAMETER_PACK           // Issue #4075
+      || pc->GetType() == CT_PAREN_CLOSE
+      || pc->GetType() == CT_PAREN_OPEN
+      || pc->GetType() == CT_PREPROC
+      || pc->GetType() == CT_QUESTION                 // Issue #4023
+      || pc->GetType() == CT_RPAREN_CLOSE             // Issue #3914
+      || pc->GetType() == CT_RPAREN_OPEN
+      || pc->GetType() == CT_SBOOL                    // Issue #3965
+      || pc->GetType() == CT_SEMICOLON
+      || pc->GetType() == CT_SHIFT                    // Issue #3983
+      || pc->GetType() == CT_SPAREN_CLOSE
+      || pc->GetType() == CT_SPAREN_OPEN
+      || pc->GetType() == CT_SQL_END
+      || pc->GetType() == CT_SQUARE_CLOSE
+      || pc->GetType() == CT_SQUARE_OPEN
+      || pc->GetType() == CT_TPAREN_CLOSE
+      || pc->GetType() == CT_TPAREN_OPEN
+      || pc->GetType() == CT_TYPEDEF
+      || pc->GetType() == CT_VBRACE_CLOSE
+      || pc->GetType() == CT_VBRACE_OPEN
+      || pc->GetType() == CT_VSEMICOLON
+      || pc->GetType() == CT_WORD)
+   {
+      LOG_FMT(LINDPSE, "ParsingFrame::pop (%s:%d): orig line is %4zu, orig col is %4zu, type is %12s\n",
+              func, line, pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()));
+   }
+   else
+   {
+      fprintf(stderr, "ParsingFrame::pop (%s:%d): orig line is %4zu, orig col is %4zu, type is %12s,\n",
+              func, line, pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()));
+      fprintf(stderr, "ParsingFrame::pop (%s:%d): the type is %s, is not coded. Please make a call.\n",
+              func, line, get_token_name(pc->GetType()));
+      log_flush(true);
+
+      if (uncrustify::options::debug_use_the_exit_function_pop())  // Issue #4075
+      {
+         exit(EX_SOFTWARE);
+      }
+   }
+#ifdef DEBUG_PUSH_POP
+   LOG_FMT(LINDPSE, "ParsingFrame::pop (%s:%d) Add is %4zu: open_line is %4zu, clos_col is %4zu, type is %12s, "
+           "cpd.level   is %2d, level is %2zu, pse_tos: %2zu -> %2zu\n",
+           func, line, (size_t)this, m_parenStack.back().open_line, m_parenStack.back().open_colu,
+           get_token_name(m_parenStack.back().type), cpd.pp_level, m_parenStack.back().level,
+           (m_parenStack.size() - 1), (m_parenStack.size() - 2));
+#else /* DEBUG_PUSH_POP */
+   LOG_FMT(LINDPSE, "ParsingFrame::pop (%s:%d): open_line is %4zu, clos_col is %4zu, type is %12s, "
+           "cpd.level   is %2d, level is %2zu, pse_tos: %2zu -> %2zu\n",
+           func, line, m_parenStack.back().GetOpenLine(), m_parenStack.back().GetOpenCol(),
+           get_token_name(m_parenStack.back().GetOpenToken()), cpd.pp_level, m_parenStack.back().GetOpenLevel(),
+           (m_parenStack.size() - 1), (m_parenStack.size() - 2));
+#endif /* DEBUG_PUSH_POP */
+
+   m_lastPopped = *std::prev(std::end(m_parenStack));
+
+   if (m_parenStack.size() == 1)
+   {
+      *std::begin(m_parenStack) = ParenStackEntry();
+   }
+   else
+   {
+      m_parenStack.pop_back();
+   }
+} // ParsingFrame::pop
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parsing_frame.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parsing_frame.h
new file mode 100644
index 00000000..1431b43d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parsing_frame.h
@@ -0,0 +1,797 @@
+/**
+ * @file parsing_frame.h
+ *
+ * Holds data needed for indenting and brace parsing
+ *
+ * @author  Daniel Chumak
+ * @license GPL v2+
+ */
+
+#ifndef PARSING_FRAME_H_INCLUDED
+#define PARSING_FRAME_H_INCLUDED
+
+#include "uncrustify_types.h"
+
+#include <vector>
+
+
+//! Class describing a parenthesis stack entry and its information
+class ParenStackEntry
+{
+public:
+   ParenStackEntry();
+
+   // --------- Access methods
+
+   /**
+    * @brief returns the token that opened the entry
+    */
+   E_Token GetOpenToken() const;
+
+   /**
+    * @brief Sets the token that opened the entry
+    * @param token the token to set
+    */
+   void SetOpenToken(const E_Token token);
+
+   /**
+    * @brief returns the chunk that opened the entry
+    */
+   Chunk *GetOpenChunk() const;
+
+   /**
+    * @brief Sets the chunk that opened the entry
+    * @param chunk the chunk to set
+    */
+   void SetOpenChunk(Chunk *chunk);
+
+   /**
+    * @brief returns the level that opened the entry
+    */
+   size_t GetOpenLevel() const;
+
+   /**
+    * @brief Sets the level that opened the entry
+    * @param level the level to set
+    */
+   void SetOpenLevel(size_t level);
+
+   /**
+    * @brief returns the line that opened the entry
+    */
+   size_t GetOpenLine() const;
+
+   /**
+    * @brief Sets the line that opened the entry
+    * @param line the line to set
+    */
+   void SetOpenLine(size_t line);
+
+   /**
+    * @brief returns the column that opened the entry
+    */
+   size_t GetOpenCol() const;
+
+   /**
+    * @brief Sets the column that opened the entry
+    * @param column the column to set
+    */
+   void SetOpenCol(size_t column);
+
+   /**
+    * @brief returns the indent for braces
+    */
+   size_t GetBraceIndent() const;
+
+   /**
+    * @brief Sets the indent for braces
+    * @param indent the indent for braces
+    */
+   void SetBraceIndent(size_t indent);
+
+   /**
+    * @brief returns the indent level
+    */
+   size_t GetIndent() const;
+
+   /**
+    * @brief Sets the indent level
+    * @param level the indent level
+    */
+   void SetIndent(size_t level);
+
+   /**
+    * @brief returns the temporary indent level
+    */
+   size_t GetIndentTmp() const;
+
+   /**
+    * @brief Sets the temporary indent level
+    * @param level the temporary indent level
+    */
+   void SetIndentTmp(size_t level);
+
+   /**
+    * @brief returns the tab indent level
+    */
+   size_t GetIndentTab() const;
+
+   /**
+    * @brief Sets the tab indent level
+    * @param level the tab indent level
+    */
+   void SetIndentTab(size_t level);
+
+   /**
+    * @brief returns the consecutive namespace levels
+    */
+   size_t GetNsCount() const;
+
+   /**
+    * @brief Sets the consecutive namespace levels
+    * @param count the consecutive namespace levels
+    */
+   void SetNsCount(size_t count);
+
+   /**
+    * @brief returns whether indent_continue was applied
+    */
+   bool GetIndentContinue() const;
+
+   /**
+    * @brief Sets whether indent_continue was applied
+    * @param cont new value
+    */
+   void SetIndentContinue(bool cont);
+
+   /**
+    * @brief returns whether this was created in a preprocessor
+    */
+   bool GetInPreproc() const;
+
+   /**
+    * @brief Sets whether this was created in a preprocessor
+    * @param preproc new value
+    */
+   void SetInPreproc(bool preproc);
+
+   /**
+    * @brief returns whether a non-vardef line was hit
+    */
+   bool GetNonVardef() const;
+
+   /**
+    * @brief Sets whether a non-vardef line was hit
+    * @param vardef new value
+    */
+   void SetNonVardef(bool vardef);
+
+   /**
+    * @brief returns the parent token (if, for, function, etc)
+    */
+   E_Token GetParent() const;
+
+   /**
+    * @brief Sets the parent token (if, for, function, etc)
+    * @param parent the token to set
+    */
+   void SetParent(const E_Token parent);
+
+   /**
+    * @brief returns the stage used to check progression of complex statements
+    */
+   E_BraceStage GetStage() const;
+
+   /**
+    * @brief Sets the stage used to check progression of complex statements
+    * @param stage the new value
+    */
+   void SetStage(const E_BraceStage stage);
+
+   /**
+    * @brief Returns the associated indentation data as a const reference
+    */
+   const IndentationData &GetIndentData() const;
+
+   /**
+    * @brief Returns the associated indentation data as a modifiable reference
+    */
+   IndentationData &IndentData();
+
+   /**
+    * @brief returns the pop chunk
+    */
+   Chunk *GetPopChunk() const;
+
+   /**
+    * @brief Sets the pop chunk
+    * @param chunk the new chunk
+    */
+   void SetPopChunk(Chunk *chunk);
+
+
+protected:
+   E_Token         m_openToken;       // the type that opened the entry
+   Chunk           *m_openChunk;      // chunk that opened the level
+   size_t          m_openLevel;       // level of opening type
+   size_t          m_openLine;        // line that open symbol is on, only for logging purposes
+   size_t          m_openCol;         // column that open symbol is on, only for logging purposes
+   size_t          m_braceIndent;     // indent for braces - may not relate to indent
+   size_t          m_indent;          // indent level (depends on use)
+   size_t          m_indentTmp;       // temporary indent level (depends on use)
+   size_t          m_indentTab;       // the 'tab' indent (always <= real column)
+   size_t          m_nsCount;         // Number of consecutive namespace levels
+   bool            m_indentContinue;  // indent_continue was applied
+   bool            m_inPreproc;       // whether this was created in a preprocessor
+   bool            m_nonVardef;       // Hit a non-vardef line
+   E_Token         m_parent;          // if, for, function, etc
+   E_BraceStage    m_stage;           // used to check progression of complex statements.
+   IndentationData m_indentationData; // Indentation data
+   Chunk           *m_popChunk;       // Pop chunk
+};
+
+
+//! Class describing a parsing frame and its information
+class ParsingFrame
+{
+public:
+   ParsingFrame();
+   virtual ~ParsingFrame() = default;
+
+   /**
+    * @brief Returns whether the frame paren stack is empty or not
+    */
+   bool empty() const;
+
+   /**
+    * @brief Returns the size of the frame paren stack
+    */
+   size_t size() const;
+
+   /**
+    * @brief Returns the last popped entry from the frame paren stack
+    */
+   const ParenStackEntry &lastPopped() const;
+
+   /**
+    * @brief Returns the frame reference number
+    */
+   size_t GetRefNumber() const;
+
+   /**
+    * @brief Set the frame reference number
+    * @param the new reference number
+    */
+   void SetRefNumber(const size_t refNo);
+
+   /**
+    * @brief Returns the frame parenthesis level
+    */
+   size_t GetParenLevel() const;
+
+   /**
+    * @brief Set the frame parenthesis level
+    * @param the new parenthesis level
+    */
+   void SetParenLevel(const size_t parenLevel);
+
+   /**
+    * @brief Returns the frame brace level
+    */
+   size_t GetBraceLevel() const;
+
+   /**
+    * @brief Set the frame brace level
+    * @param the new brace level
+    */
+   void SetBraceLevel(const size_t braceLevel);
+
+   /**
+    * @brief Returns the frame preprocessor level
+    */
+   size_t GetPpLevel() const;
+
+   /**
+    * @brief Set the frame preprocessor level
+    * @param the new preprocessor level
+    */
+   void SetPpLevel(const size_t ppLevel);
+
+   /**
+    * @brief Returns the count of special parenthesis
+    */
+   size_t GetSParenCount() const;
+
+   /**
+    * @brief Set the count of special parenthesis
+    * @param the new special parenthesis count value
+    */
+   void SetSParenCount(const size_t sParenCount);
+
+   /**
+    * @brief Returns the count of parenthesis
+    */
+   size_t GetParenCount() const;
+
+   /**
+    * @brief Set the count of parenthesis
+    * @param the new parenthesis count value
+    */
+   void SetParenCount(const size_t parenCount);
+
+   /**
+    * @brief Returns the count of statements
+    */
+   size_t GetStmtCount() const;
+
+   /**
+    * @brief Set the count of statements
+    * @param the new statement count value
+    */
+   void SetStmtCount(const size_t stmtCount);
+
+   /**
+    * @brief Returns the count of statements
+    */
+   size_t GetExprCount() const;
+
+   /**
+    * @brief Set the count of statements
+    * @param the new statement count value
+    */
+   void SetExprCount(const size_t exprCount);
+
+   /**
+    * @brief Returns the ifdef type
+    */
+   E_Token GetIfdefType() const;
+
+   /**
+    * @brief Set the ifdef type
+    * @param the new type
+    */
+   void SetIfdefType(const E_Token inIfdef);
+
+   ParenStackEntry &at(size_t idx);
+   const ParenStackEntry &at(size_t idx) const;
+
+   ParenStackEntry &prev(size_t idx = 1);
+   const ParenStackEntry &prev(size_t idx = 1) const;
+
+   ParenStackEntry &top();
+   const ParenStackEntry &top() const;
+
+   void push(Chunk *pc, const char *func, int line, E_BraceStage stage = E_BraceStage::NONE);
+   void pop(const char *func, int line, Chunk *pc);
+
+   using iterator = std::vector<ParenStackEntry>::iterator;
+   iterator begin();
+   iterator end();
+
+   using const_iterator = std::vector<ParenStackEntry>::const_iterator;
+   const_iterator begin() const;
+   const_iterator end() const;
+
+   using reverse_iterator = std::vector<ParenStackEntry>::reverse_iterator;
+   reverse_iterator rbegin();
+   reverse_iterator rend();
+
+   using const_reverse_iterator = std::vector<ParenStackEntry>::const_reverse_iterator;
+   const_reverse_iterator rbegin() const;
+   const_reverse_iterator rend() const;
+
+
+protected:
+   // Members
+   std::vector<ParenStackEntry> m_parenStack;  //! The parenthesis stack
+   ParenStackEntry              m_lastPopped;  //! last popped frame or nullptr
+
+   size_t                       m_refNumber;   //! frame reference number
+   size_t                       m_parenLevel;  //! level of parens/square/angle/brace
+   size_t                       m_braceLevel;  //! level of brace/vbrace
+   size_t                       m_ppLevel;     //! level of preproc #if stuff
+   size_t                       m_sParenCount; //! count of special parenthesis
+   size_t                       m_parenCount;  //! count of parenthesis
+   size_t                       m_stmtCount;   //! count of statements
+   size_t                       m_exprCount;   //! count of expressions
+   E_Token                      m_ifdefType;   //! the ifdef type
+};
+
+
+// ------------------------------
+// ParenStackEntry inline methods
+// ------------------------------
+inline E_Token ParenStackEntry::GetOpenToken() const
+{
+   return(m_openToken);
+}
+
+
+inline void ParenStackEntry::SetOpenToken(const E_Token token)
+{
+   m_openToken = token;
+}
+
+
+inline Chunk *ParenStackEntry::GetOpenChunk() const
+{
+   return(m_openChunk);
+}
+
+
+inline void ParenStackEntry::SetOpenChunk(Chunk *chunk)
+{
+   m_openChunk = chunk;
+}
+
+
+inline size_t ParenStackEntry::GetOpenLevel() const
+{
+   return(m_openLevel);
+}
+
+
+inline void ParenStackEntry::SetOpenLevel(size_t level)
+{
+   m_openLevel = level;
+}
+
+
+inline size_t ParenStackEntry::GetOpenLine() const
+{
+   return(m_openLine);
+}
+
+
+inline void ParenStackEntry::SetOpenLine(size_t line)
+{
+   m_openLine = line;
+}
+
+
+inline size_t ParenStackEntry::GetOpenCol() const
+{
+   return(m_openCol);
+}
+
+
+inline void ParenStackEntry::SetOpenCol(size_t column)
+{
+   m_openCol = column;
+}
+
+
+inline size_t ParenStackEntry::GetBraceIndent() const
+{
+   return(m_braceIndent);
+}
+
+
+inline void ParenStackEntry::SetBraceIndent(size_t indent)
+{
+   m_braceIndent = indent;
+}
+
+
+inline size_t ParenStackEntry::GetIndent() const
+{
+   return(m_indent);
+}
+
+
+inline void ParenStackEntry::SetIndent(size_t level)
+{
+   m_indent = level;
+}
+
+
+inline size_t ParenStackEntry::GetIndentTmp() const
+{
+   return(m_indentTmp);
+}
+
+
+inline void ParenStackEntry::SetIndentTmp(size_t level)
+{
+   m_indentTmp = level;
+}
+
+
+inline size_t ParenStackEntry::GetIndentTab() const
+{
+   return(m_indentTab);
+}
+
+
+inline void ParenStackEntry::SetIndentTab(size_t level)
+{
+   m_indentTab = level;
+}
+
+
+inline size_t ParenStackEntry::GetNsCount() const
+{
+   return(m_nsCount);
+}
+
+
+inline void ParenStackEntry::SetNsCount(size_t count)
+{
+   m_nsCount = count;
+}
+
+
+inline bool ParenStackEntry::GetIndentContinue() const
+{
+   return(m_indentContinue);
+}
+
+
+inline void ParenStackEntry::SetIndentContinue(bool cont)
+{
+   m_indentContinue = cont;
+}
+
+
+inline bool ParenStackEntry::GetInPreproc() const
+{
+   return(m_inPreproc);
+}
+
+
+inline void ParenStackEntry::SetInPreproc(bool preproc)
+{
+   m_inPreproc = preproc;
+}
+
+
+inline bool ParenStackEntry::GetNonVardef() const
+{
+   return(m_nonVardef);
+}
+
+
+inline void ParenStackEntry::SetNonVardef(bool vardef)
+{
+   m_nonVardef = vardef;
+}
+
+
+inline E_Token ParenStackEntry::GetParent() const
+{
+   return(m_parent);
+}
+
+
+inline void ParenStackEntry::SetParent(const E_Token parent)
+{
+   m_parent = parent;
+}
+
+
+inline E_BraceStage ParenStackEntry::GetStage() const
+{
+   return(m_stage);
+}
+
+
+inline void ParenStackEntry::SetStage(const E_BraceStage stage)
+{
+   m_stage = stage;
+}
+
+
+inline const IndentationData &ParenStackEntry::GetIndentData() const
+{
+   return(m_indentationData);
+}
+
+
+inline IndentationData &ParenStackEntry::IndentData()
+{
+   return(m_indentationData);
+}
+
+
+inline Chunk *ParenStackEntry::GetPopChunk() const
+{
+   return(m_popChunk);
+}
+
+
+inline void ParenStackEntry::SetPopChunk(Chunk *chunk)
+{
+   m_popChunk = chunk;
+}
+
+
+// ------------------------------
+// ParsingFrame inline methods
+// ------------------------------
+inline bool ParsingFrame::empty() const
+{
+   return(m_parenStack.empty());
+}
+
+
+inline size_t ParsingFrame::size() const
+{
+   return(m_parenStack.size());
+}
+
+
+inline const ParenStackEntry &ParsingFrame::lastPopped() const
+{
+   return(m_lastPopped);
+}
+
+
+inline size_t ParsingFrame::GetRefNumber() const
+{
+   return(m_refNumber);
+}
+
+
+inline void ParsingFrame::SetRefNumber(const size_t refNo)
+{
+   m_refNumber = refNo;
+}
+
+
+inline size_t ParsingFrame::GetParenLevel() const
+{
+   return(m_parenLevel);
+}
+
+
+inline void ParsingFrame::SetParenLevel(const size_t parenLevel)
+{
+   m_parenLevel = parenLevel;
+}
+
+
+inline size_t ParsingFrame::GetBraceLevel() const
+{
+   return(m_braceLevel);
+}
+
+
+inline void ParsingFrame::SetBraceLevel(const size_t braceLevel)
+{
+   m_braceLevel = braceLevel;
+}
+
+
+inline size_t ParsingFrame::GetPpLevel() const
+{
+   return(m_ppLevel);
+}
+
+
+inline void ParsingFrame::SetPpLevel(const size_t ppLevel)
+{
+   m_ppLevel = ppLevel;
+}
+
+
+inline size_t ParsingFrame::GetSParenCount() const
+{
+   return(m_sParenCount);
+}
+
+
+inline void ParsingFrame::SetSParenCount(const size_t sParenCount)
+{
+   m_sParenCount = sParenCount;
+}
+
+
+inline size_t ParsingFrame::GetParenCount() const
+{
+   return(m_parenCount);
+}
+
+
+inline void ParsingFrame::SetParenCount(const size_t parenCount)
+{
+   m_parenCount = parenCount;
+}
+
+
+inline size_t ParsingFrame::GetStmtCount() const
+{
+   return(m_stmtCount);
+}
+
+
+inline void ParsingFrame::SetStmtCount(const size_t stmtCount)
+{
+   m_stmtCount = stmtCount;
+}
+
+
+inline size_t ParsingFrame::GetExprCount() const
+{
+   return(m_exprCount);
+}
+
+
+inline void ParsingFrame::SetExprCount(const size_t exprCount)
+{
+   m_exprCount = exprCount;
+}
+
+
+inline E_Token ParsingFrame::GetIfdefType() const
+{
+   return(m_ifdefType);
+}
+
+
+inline void ParsingFrame::SetIfdefType(const E_Token inIfdef)
+{
+   m_ifdefType = inIfdef;
+}
+
+
+inline ParenStackEntry &ParsingFrame::at(size_t idx)
+{
+   return(m_parenStack.at(idx));
+}
+
+
+inline const ParenStackEntry &ParsingFrame::at(size_t idx) const
+{
+   return(m_parenStack.at(idx));
+}
+
+
+inline ParsingFrame::iterator ParsingFrame::begin()
+{
+   return(std::begin(m_parenStack));
+}
+
+
+inline ParsingFrame::const_iterator ParsingFrame::begin() const
+{
+   return(std::begin(m_parenStack));
+}
+
+
+inline ParsingFrame::reverse_iterator ParsingFrame::rbegin()
+{
+   return(m_parenStack.rbegin());
+}
+
+
+inline ParsingFrame::const_reverse_iterator ParsingFrame::rbegin() const
+{
+   return(m_parenStack.rbegin());
+}
+
+
+inline ParsingFrame::iterator ParsingFrame::end()
+{
+   return(std::end(m_parenStack));
+}
+
+
+inline ParsingFrame::const_iterator ParsingFrame::end() const
+{
+   return(std::end(m_parenStack));
+}
+
+
+inline ParsingFrame::reverse_iterator ParsingFrame::rend()
+{
+   return(m_parenStack.rend());
+}
+
+
+inline ParsingFrame::const_reverse_iterator ParsingFrame::rend() const
+{
+   return(m_parenStack.rend());
+}
+
+
+#endif /* PARSING_FRAME_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/frame_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parsing_frame_stack.cpp
index da94ba2f..7a370b16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/frame_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parsing_frame_stack.cpp
@@ -1,12 +1,12 @@
 /**
- * @file frame_list.cpp
+ * @file parsing_frame_stack.cpp
  * mainly used to handle preprocessor stuff
  *
  * @author  Ben Gardner
  * @license GPL v2+
  */
 
-#include "frame_list.h"
+#include "parsing_frame_stack.h"
 
 #include "prototypes.h"
 
@@ -14,72 +14,74 @@
 namespace
 {
 
-void fl_log_frms(log_sev_t logsev, const char *txt, const ParseFrame &frm, const std::vector<ParseFrame> &frames);
+typedef std::vector<ParsingFrame> ParsingFrameOrigStack;
+
+void fl_log_frms(log_sev_t logsev, const char *txt, const ParsingFrame &frm, const ParsingFrameOrigStack &frames);
 
 
 //! Logs the entire parse frame stack
-void fl_log_all(log_sev_t logsev, const std::vector<ParseFrame> &frames);
+void fl_log_all(log_sev_t logsev, const ParsingFrameOrigStack &frames);
 
 
 /**
- * Copy the top element of the frame list into the ParseFrame.
+ * Copy the top element of the frame list into the ParsingFrame.
  *
  * If the frame list is empty nothing happens.
  *
  * This is called on #else and #elif.
  */
-void fl_copy_tos(ParseFrame &pf, const std::vector<ParseFrame> &frames);
+void fl_copy_tos(ParsingFrame &pf, const ParsingFrameOrigStack &frames);
 
 
 /**
- * Copy the 2nd top element off the list into the ParseFrame.
+ * Copy the 2nd top element off the list into the ParsingFrame.
  * This is called on #else and #elif.
  * The stack contains [...] [base] [if] at this point.
  * We want to copy [base].
  */
-void fl_copy_2nd_tos(ParseFrame &pf, const std::vector<ParseFrame> &frames);
+void fl_copy_2nd_tos(ParsingFrame &pf, const ParsingFrameOrigStack &frames);
 
 
 //! Deletes the top element from the list.
-void fl_trash_tos(std::vector<ParseFrame> &frames);
+void fl_trash_tos(ParsingFrameOrigStack &frames);
 
 
 //! Logs one parse frame
-void fl_log(log_sev_t logsev, const ParseFrame &frm)
+void fl_log(log_sev_t logsev, const ParsingFrame &frm)
 {
-   LOG_FMT(logsev, "[%s] BrLevel=%zu Level=%zu PseTos=%zu\n",
-           get_token_name(frm.in_ifdef), frm.brace_level, frm.level, frm.size() - 1);
+   LOG_FMT(logsev, "[%s] Brace level=%zu Paren level=%zu PseTos=%zu\n",
+           get_token_name(frm.GetIfdefType()), frm.GetBraceLevel(), frm.GetParenLevel(), frm.size() - 1);
 
    LOG_FMT(logsev, " *");
 
    for (size_t idx = 1; idx < frm.size(); idx++)
    {
-      LOG_FMT(logsev, " [%s-%s]", get_token_name(frm.at(idx).type),
-              get_brace_stage_name(frm.at(idx).stage));
+      LOG_FMT(logsev, " [%s-%s]", get_token_name(frm.at(idx).GetOpenToken()),
+              get_brace_stage_name(frm.at(idx).GetStage()));
    }
 
    LOG_FMT(logsev, "\n");
 }
 
 
-void fl_log_frms(log_sev_t                     logsev,
-                 const char                    *txt,
-                 const ParseFrame              &frm,
-                 const std::vector<ParseFrame> &frames)
+void fl_log_frms(log_sev_t                   logsev,
+                 const char                  *txt,
+                 const ParsingFrame          &frm,
+                 const ParsingFrameOrigStack &frames)
 {
    LOG_FMT(logsev, "%s Parse Frames(%zu):", txt, frames.size());
 
    for (const auto &frame : frames)
    {
-      LOG_FMT(logsev, " [%s-%zu]", get_token_name(frame.in_ifdef),
-              frame.ref_no);
+      LOG_FMT(logsev, " [%s-%zu]", get_token_name(frame.GetIfdefType()),
+              frame.GetRefNumber());
    }
 
-   LOG_FMT(logsev, "-[%s-%zu]\n", get_token_name(frm.in_ifdef), frm.ref_no);
+   LOG_FMT(logsev, "-[%s-%zu]\n", get_token_name(frm.GetIfdefType()), frm.GetRefNumber());
 }
 
 
-void fl_log_all(log_sev_t logsev, const std::vector<ParseFrame> &frames)
+void fl_log_all(log_sev_t logsev, const ParsingFrameOrigStack &frames)
 {
    LOG_FMT(logsev, "##=- Parse Frame : %zu entries\n", frames.size());
 
@@ -94,7 +96,7 @@ void fl_log_all(log_sev_t logsev, const std::vector<ParseFrame> &frames)
 }
 
 
-void fl_copy_tos(ParseFrame &pf, const std::vector<ParseFrame> &frames)
+void fl_copy_tos(ParsingFrame &pf, const ParsingFrameOrigStack &frames)
 {
    if (!frames.empty())
    {
@@ -104,7 +106,7 @@ void fl_copy_tos(ParseFrame &pf, const std::vector<ParseFrame> &frames)
 }
 
 
-void fl_copy_2nd_tos(ParseFrame &pf, const std::vector<ParseFrame> &frames)
+void fl_copy_2nd_tos(ParsingFrame &pf, const ParsingFrameOrigStack &frames)
 {
    if (frames.size() > 1)
    {
@@ -114,7 +116,7 @@ void fl_copy_2nd_tos(ParseFrame &pf, const std::vector<ParseFrame> &frames)
 }
 
 
-void fl_trash_tos(std::vector<ParseFrame> &frames)
+void fl_trash_tos(ParsingFrameOrigStack &frames)
 {
    if (!frames.empty())
    {
@@ -126,29 +128,35 @@ void fl_trash_tos(std::vector<ParseFrame> &frames)
 } // namespace
 
 
-void fl_push(std::vector<ParseFrame> &frames, ParseFrame &frm)
+ParsingFrameStack::ParsingFrameStack()
+   : m_frames()
 {
-   static int ref_no = 1;
+}
 
-   frames.push_back(frm);
-   frm.ref_no = ref_no++;
 
-   LOG_FMT(LPF, "%s(%d): frame_count is %zu\n", __func__, __LINE__, frames.size());
+void ParsingFrameStack::push(ParsingFrame &frm)
+{
+   static int seq_ref_no = 1;
+
+   m_frames.push_back(frm);
+   frm.SetRefNumber(seq_ref_no++);
+
+   LOG_FMT(LPF, "%s(%d): frame_count is %zu\n", __func__, __LINE__, m_frames.size());
 }
 
 
-void fl_pop(std::vector<ParseFrame> &frames, ParseFrame &pf)
+void ParsingFrameStack::pop(ParsingFrame &pf)
 {
-   if (frames.empty())
+   if (m_frames.empty())
    {
       return;
    }
-   fl_copy_tos(pf, frames);
-   fl_trash_tos(frames);
+   fl_copy_tos(pf, m_frames);
+   fl_trash_tos(m_frames);
 }
 
 
-int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, Chunk *pc)
+int ParsingFrameStack::check(ParsingFrame &frm, int &pp_level, Chunk *pc)
 {
    if (pc->IsNot(CT_PREPROC))
    {
@@ -170,12 +178,12 @@ int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, Ch
    }
    LOG_FMT(LPFCHK, "%s(%d): orig line is %zu, %s\n",
            __func__, __LINE__, pc->GetOrigLine(), get_token_name(pc->GetParentType()));
-   fl_log_frms(LPFCHK, "TOP", frm, frames);
+   fl_log_frms(LPFCHK, "TOP", frm, m_frames);
 
 
    int           out_pp_level = pp_level;
-   const E_Token in_ifdef     = frm.in_ifdef;
-   const size_t  b4_cnt       = frames.size();
+   const E_Token in_ifdef     = frm.GetIfdefType();
+   const size_t  b4_cnt       = m_frames.size();
 
    const char    *txt = nullptr;
 
@@ -188,9 +196,9 @@ int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, Ch
       {
          // An #if pushes a copy of the current frame on the stack
          pp_level++;
-         fl_push(frames, frm);
-         frm.in_ifdef = CT_PP_IF;
-         txt          = "if-push";
+         push(frm);
+         frm.SetIfdefType(CT_PP_IF);
+         txt = "if-push";
       }
       else if (pc->GetParentType() == CT_PP_ELSE)
       {
@@ -212,22 +220,22 @@ int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, Ch
           */
          bool if_block = false;
 
-         if (frm.in_ifdef == CT_PP_IF)
+         if (frm.GetIfdefType() == CT_PP_IF)
          {
             // we have [...] [base]-[if], so push an [else]
-            fl_push(frames, frm);
-            frm.in_ifdef = CT_PP_ELSE;
-            if_block     = true;
+            push(frm);
+            frm.SetIfdefType(CT_PP_ELSE);
+            if_block = true;
          }
-         size_t brace_level = frm.brace_level;
+         size_t brace_level = frm.GetBraceLevel();
          // we have [...] [base] [if]-[else], copy [base] over [else]
-         fl_copy_2nd_tos(frm, frames);
-         frm.in_ifdef = CT_PP_ELSE;
+         fl_copy_2nd_tos(frm, m_frames);
+         frm.SetIfdefType(CT_PP_ELSE);
 
          if (if_block)
          {
             // check if #if block was unbalanced
-            size_t base_brace_level = frames[frames.size() - 2].brace_level;
+            size_t base_brace_level = m_frames[m_frames.size() - 2].GetBraceLevel();
 
             if (  options::pp_warn_unbalanced_if()
                && brace_level != base_brace_level)
@@ -239,7 +247,7 @@ int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, Ch
          else
          {
             // check if previous #else block has a different indentation than the corresponding #if block
-            size_t if_brace_level = frames[frames.size() - 1].brace_level;
+            size_t if_brace_level = m_frames[m_frames.size() - 1].GetBraceLevel();
 
             if (  options::pp_warn_unbalanced_if()
                && brace_level != if_brace_level)
@@ -275,50 +283,50 @@ int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, Ch
          }
          out_pp_level--;
 
-         if (frm.in_ifdef == CT_PP_ELSE)
+         if (frm.GetIfdefType() == CT_PP_ELSE)
          {
-            size_t brace_level = frm.brace_level; // brace level or current #else block
+            size_t brace_level = frm.GetBraceLevel(); // brace level or current #else block
             /*
              * We have: [...] [base] [if]-[else]
              * We want: [...]-[if]
              */
-            fl_copy_tos(frm, frames);             // [...] [base] [if]-[if]
+            fl_copy_tos(frm, m_frames);               // [...] [base] [if]-[if]
 
             if (  options::pp_warn_unbalanced_if()
-               && brace_level != frm.brace_level)
+               && brace_level != frm.GetBraceLevel())
             {
                LOG_FMT(LWARN, "%s(%d): orig line is %zu, unbalanced #if-#else block braces (2), #else out-level is %zu, #if out-level is %zu\n",
-                       __func__, __LINE__, pc->GetOrigLine(), brace_level, frm.brace_level);
+                       __func__, __LINE__, pc->GetOrigLine(), brace_level, frm.GetBraceLevel());
             }
 
-            if (frames.size() < 2)
+            if (m_frames.size() < 2)
             {
                fprintf(stderr, "Number of 'frame' is too small.\n");
                fprintf(stderr, "Please make a report.\n");
                log_flush(true);
                exit(EX_SOFTWARE);
             }
-            frm.in_ifdef = frames[frames.size() - 2].in_ifdef;
-            fl_trash_tos(frames);       // [...] [base]-[if]
-            fl_trash_tos(frames);       // [...]-[if]
+            frm.SetIfdefType(m_frames[m_frames.size() - 2].GetIfdefType());
+            fl_trash_tos(m_frames);       // [...] [base]-[if]
+            fl_trash_tos(m_frames);       // [...]-[if]
 
             txt = "endif-trash/pop";
          }
-         else if (frm.in_ifdef == CT_PP_IF)
+         else if (frm.GetIfdefType() == CT_PP_IF)
          {
             /*
              * We have: [...] [base] [if]
              * We want: [...] [base]
              */
             // check if #if block was unbalanced
-            size_t brace_level = frm.brace_level;
-            fl_pop(frames, frm);
+            size_t brace_level = frm.GetBraceLevel();
+            pop(frm);
 
             if (  options::pp_warn_unbalanced_if()
-               && brace_level != frm.brace_level)
+               && brace_level != frm.GetBraceLevel())
             {
                LOG_FMT(LWARN, "%s(%d): orig line is %zu, unbalanced #if block braces (2), in-level is %zu, out-level is %zu\n",
-                       __func__, __LINE__, pc->GetOrigLine(), frm.brace_level, brace_level);
+                       __func__, __LINE__, pc->GetOrigLine(), frm.GetBraceLevel(), brace_level);
             }
             txt = "endif-pop";
          }
@@ -331,15 +339,15 @@ int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, Ch
 
    if (txt != nullptr)
    {
-      LOG_FMT(LPF, "%s(%d): orig line is %zu, type is %s: %s in_ifdef is %s/%s, counts is %zu, frame_count is %zu\n",
+      LOG_FMT(LPF, "%s(%d): orig line is %zu, type is %s: %s ifdef token is %s/%s, counts is %zu, frame_count is %zu\n",
               __func__, __LINE__, pc->GetOrigLine(),
               get_token_name(pc->GetParentType()), txt, get_token_name(in_ifdef),
-              get_token_name(frm.in_ifdef), b4_cnt, frames.size());
-      fl_log_all(LPF, frames);
+              get_token_name(frm.GetIfdefType()), b4_cnt, m_frames.size());
+      fl_log_all(LPF, m_frames);
       LOG_FMT(LPF, " <Out>");
       fl_log(LPF, frm);
    }
-   fl_log_frms(LPFCHK, "END", frm, frames);
+   fl_log_frms(LPFCHK, "END", frm, m_frames);
 
    return(out_pp_level);
-} // fl_check
+} // check
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parsing_frame_stack.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parsing_frame_stack.h
new file mode 100644
index 00000000..0cc908dc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/parsing_frame_stack.h
@@ -0,0 +1,43 @@
+/**
+ * @file parsing_frame_stack.h
+ * mainly used to handle preprocessor stuff
+ *
+ * @author  Ben Gardner
+ * @license GPL v2+
+ */
+
+#ifndef PARSING_FRAME_STACK_H_INCLUDED
+#define PARSING_FRAME_STACK_H_INCLUDED
+
+#include "parsing_frame.h"
+
+//! Class describing a parsing frame stack
+class ParsingFrameStack
+{
+public:
+   ParsingFrameStack();
+
+   /**
+    * Push a copy of a ParsingFrame onto the frame stack.
+    */
+   void push(ParsingFrame &frm);
+
+
+   /**
+    * Pop and return the top element of the frame stack.
+    * TODO: return the frame rather than passing it as argument
+    */
+   void pop(ParsingFrame &pf);
+
+
+   // TODO: this name is dumb:
+   // - what is it checking?
+   // - why does is much more than simple checks, it allters kinds of stuff
+   //! Returns the pp_indent to use for this line
+   int check(ParsingFrame &frm, int &pp_level, Chunk *pc);
+
+private:
+   std::vector<ParsingFrame> m_frames;
+};
+
+#endif /* PARSING_FRAME_STACK_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/pcf_flags.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/pcf_flags.cpp
index da0a9461..1b8722e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/pcf_flags.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/pcf_flags.cpp
@@ -58,20 +58,17 @@ static const char *pcf_names[] =
    "WF_IF",             // 46
    "NOT_POSSIBLE",      // 47
    "IN_CONDITIONAL",    // 48                    Issue #3558
-   "PCF_OC_IN_BLOCK",   // 49
+   "OC_IN_BLOCK",       // 49
+   "CONT_LINE",         // 50
 };
 
 
-std::string pcf_flags_str(T_PcfFlags flags)
+std::string pcf_flags_str(PcfFlags flags)
 {
    char buffer[64];
 
    // Generate hex representation first
-#ifdef WIN32
-   snprintf(buffer, 63, "[");
-#else // not WIN32
    snprintf(buffer, 63, "[0x%llx:", (long long unsigned int)(flags));
-#endif // ifdef WIN32
 
    // Add human-readable names
    auto out   = std::string{ buffer };
@@ -98,11 +95,11 @@ std::string pcf_flags_str(T_PcfFlags flags)
 }
 
 
-void log_pcf_flags(log_sev_t sev, T_PcfFlags flags)
+void log_pcf_flags(log_sev_t sev, PcfFlags flags)
 {
    if (!log_sev_on(sev))
    {
       return;
    }
-   log_fmt(sev, "%s\n", pcf_flags_str(flags).c_str());
+   log_fmt(sev, "   chunk flags: %s\n", pcf_flags_str(flags).c_str());
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/pcf_flags.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/pcf_flags.h
index 02e0b57c..7f09edb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/pcf_flags.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/pcf_flags.h
@@ -8,13 +8,14 @@
 #ifndef PCF_FLAGS_STR_INCLUDED
 #define PCF_FLAGS_STR_INCLUDED
 
+#include "base_types.h"
 #include "enum_flags.h"
 #include "logger.h"
 
-// and the ever-so-important array size macro
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(x)    (sizeof(x) / sizeof((x)[0]))
-#endif
+//// and the ever-so-important array size macro
+//#ifndef ARRAY_SIZE
+//#define ARRAY_SIZE(x)    (sizeof(x) / sizeof((x)[0]))
+//#endif
 
 using namespace std;
 
@@ -84,15 +85,16 @@ enum E_PcfFlag : decltype ( 0ULL )
                                        //! because the line would be too long
    PCF_IN_CONDITIONAL  = pcf_bit(48),  //! inside a conditional ternary expression
    PCF_OC_IN_BLOCK     = pcf_bit(49),  //! inside OC block function
+   PCF_CONT_LINE       = pcf_bit(50),  //! continuation line split
 };
 
-UNC_DECLARE_FLAGS(T_PcfFlags, E_PcfFlag);
-UNC_DECLARE_OPERATORS_FOR_FLAGS(T_PcfFlags);
+UNC_DECLARE_FLAGS(PcfFlags, E_PcfFlag);
+UNC_DECLARE_OPERATORS_FOR_FLAGS(PcfFlags);
 
-std::string pcf_flags_str(T_PcfFlags flags);
+std::string pcf_flags_str(PcfFlags flags);
 
 
-void log_pcf_flags(log_sev_t sev, T_PcfFlags flags);
+void log_pcf_flags(log_sev_t sev, PcfFlags flags);
 
 
 #endif /* PCF_FLAGS_STR_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/pragma_cleanup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/pragma_cleanup.cpp
index 336a1272..336a1272 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/pragma_cleanup.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/pragma_cleanup.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/pragma_cleanup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/pragma_cleanup.h
index 47a3a03d..47a3a03d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/pragma_cleanup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/pragma_cleanup.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/prototypes.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/prototypes.h
index 55fe35b6..55fe35b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/prototypes.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/prototypes.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/punctuators.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/punctuators.cpp
index 6c9c41f4..1d1aab3d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/punctuators.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/punctuators.cpp
@@ -25,6 +25,7 @@ using namespace uncrustify;
  *   If you change one of the below symbol tables, re-run punc.py.
  *   $ python scripts/punc.py > src/punctuator_table.h
  *   now automatically with CMakeLists.txt
+ *   Automatically generated by <code>scripts/make_punctuator_table.py</code>
  *
  *   NOTE: the tables below do not need to be sorted.
  */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/punctuators.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/punctuators.h
index ed4c3fa5..ed4c3fa5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/punctuators.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/punctuators.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/quick_align_again.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/quick_align_again.cpp
index 5cc8bcd6..640abba9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/quick_align_again.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/quick_align_again.cpp
@@ -23,25 +23,25 @@ void quick_align_again()
       LOG_FMT(LALAGAIN, "%s(%d): orig line is %zu, orig col is %zu, column is %zu, Text() '%s'\n",
               __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->GetColumn(), pc->ElidedText(copy));
 
-      if (  pc->GetAlignmentData().next != nullptr
+      if (  pc->GetAlignData().next->IsNotNullChunk()
          && pc->TestFlags(PCF_ALIGN_START))
       {
          AlignStack as;
          as.Start(100, 0);
-         as.m_right_align = pc->GetAlignmentData().right_align;
-         as.m_star_style  = static_cast<AlignStack::StarStyle>(pc->GetAlignmentData().star_style);
-         as.m_amp_style   = static_cast<AlignStack::StarStyle>(pc->GetAlignmentData().amp_style);
-         as.m_gap         = pc->GetAlignmentData().gap;
+         as.m_right_align = pc->GetAlignData().right_align;
+         as.m_star_style  = static_cast<AlignStack::StarStyle>(pc->GetAlignData().star_style);
+         as.m_amp_style   = static_cast<AlignStack::StarStyle>(pc->GetAlignData().amp_style);
+         as.m_gap         = pc->GetAlignData().gap;
 
          LOG_FMT(LALAGAIN, "%s(%d):   pc->Text() is '%s', orig line is %zu\n",
                  __func__, __LINE__, pc->Text(), pc->GetOrigLine());
-         as.Add(pc->GetAlignmentData().start);
+         as.Add(pc->GetAlignData().start);
          pc->SetFlagBits(PCF_WAS_ALIGNED);
 
-         for (Chunk *tmp = pc->GetAlignmentData().next; tmp != nullptr; tmp = tmp->GetAlignmentData().next)
+         for (Chunk *tmp = pc->GetAlignData().next; tmp->IsNotNullChunk(); tmp = tmp->GetAlignData().next)
          {
             tmp->SetFlagBits(PCF_WAS_ALIGNED);
-            as.Add(tmp->GetAlignmentData().start);
+            as.Add(tmp->GetAlignData().start);
             LOG_FMT(LALAGAIN, "%s(%d):    => tmp->Text() is '%s', orig line is %zu\n",
                     __func__, __LINE__, tmp->Text(), tmp->GetOrigLine());
          }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/quick_align_again.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/quick_align_again.h
index c370c612..c370c612 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/quick_align_again.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/quick_align_again.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/remove_duplicate_include.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/remove_duplicate_include.cpp
index e06029f1..e06029f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/remove_duplicate_include.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/remove_duplicate_include.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/remove_duplicate_include.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/remove_duplicate_include.h
index c58416c2..c58416c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/remove_duplicate_include.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/remove_duplicate_include.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/remove_extra_returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/remove_extra_returns.cpp
index da7c9ba1..221e97b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/remove_extra_returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/remove_extra_returns.cpp
@@ -51,13 +51,16 @@ void remove_extra_returns()
          {
             // it is not a class
             // look for a closing brace
+            // make sure we are at level 1 because 'return' could
+            // be part of nested 'if' blocks
             closing_brace = pc->GetNextType(CT_BRACE_CLOSE, 0);
             LOG_FMT(LRMRETURN, "%s(%d): on orig line %zu, level is %zu\n",
                     __func__, __LINE__, pc->GetOrigLine(), pc->GetLevel());
 
             if (closing_brace->IsNotNullChunk())
             {
-               if (closing_brace->GetParentType() == CT_FUNC_DEF)
+               if (  closing_brace->GetParentType() == CT_FUNC_DEF
+                  && pc->GetLevel() < 2)
                {
                   remove_it = true;
                }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/remove_extra_returns.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/remove_extra_returns.h
index 85fc6429..85fc6429 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/remove_extra_returns.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/remove_extra_returns.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/rewrite_infinite_loops.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/rewrite_infinite_loops.cpp
index 6b97ea7d..6b97ea7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/rewrite_infinite_loops.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/rewrite_infinite_loops.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/rewrite_infinite_loops.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/rewrite_infinite_loops.h
index 5b8f3fee..5b8f3fee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/rewrite_infinite_loops.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/rewrite_infinite_loops.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/semicolons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/semicolons.cpp
index 390fdecb..569f5271 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/semicolons.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/semicolons.cpp
@@ -58,34 +58,31 @@ void remove_extra_semicolons()
             // keep it
          }
          else if (  prev->Is(CT_BRACE_CLOSE)
-                 && (  prev->GetParentType() == CT_IF
+                 && (  prev->GetParentType() == CT_ELSE
                     || prev->GetParentType() == CT_ELSEIF
-                    || prev->GetParentType() == CT_ELSE
-                    || prev->GetParentType() == CT_SWITCH
-                    || prev->GetParentType() == CT_WHILE
-                    || prev->GetParentType() == CT_USING_STMT
                     || prev->GetParentType() == CT_FOR
+                    || prev->GetParentType() == CT_FUNC_CLASS_DEF
                     || prev->GetParentType() == CT_FUNC_DEF
+                    || prev->GetParentType() == CT_IF
+                    || prev->GetParentType() == CT_NAMESPACE
                     || prev->GetParentType() == CT_OC_MSG_DECL
-                    || prev->GetParentType() == CT_FUNC_CLASS_DEF
-                    || prev->GetParentType() == CT_NAMESPACE))
+                    || prev->GetParentType() == CT_SWITCH
+                    || prev->GetParentType() == CT_USING_STMT
+                    || prev->GetParentType() == CT_WHILE))
          {
             // looking for code block vs. initialisation
             bool  code_block_found = true;
             Chunk *closing_brace   = pc->GetPrevNcNnl();                   // Issue #3506
 
-            if (  closing_brace != nullptr
-               && closing_brace->IsNotNullChunk())
+            if (closing_brace->IsNotNullChunk())
             {
                Chunk *opening_brace = closing_brace->GetOpeningParen();
 
-               if (  opening_brace != nullptr
-                  && opening_brace->IsNotNullChunk())
+               if (opening_brace->IsNotNullChunk())
                {
                   Chunk *equal_sign = opening_brace->GetPrevNcNnl();
 
-                  if (  equal_sign != nullptr
-                     && equal_sign->IsNotNullChunk()
+                  if (  equal_sign->IsNotNullChunk()
                      && equal_sign->Is(CT_ASSIGN))
                   {
                      // initialisation found
@@ -112,8 +109,8 @@ void remove_extra_semicolons()
          }
          else if (  language_is_set(LANG_D)
                  && (  prev->GetParentType() == CT_ENUM
-                    || prev->GetParentType() == CT_UNION
-                    || prev->GetParentType() == CT_STRUCT))
+                    || prev->GetParentType() == CT_STRUCT
+                    || prev->GetParentType() == CT_UNION))
          {
             remove_semicolon(pc);
          }
@@ -140,12 +137,13 @@ static void check_unknown_brace_close(Chunk *semi, Chunk *brace_close)
    pc = pc->GetPrevNcNnl();
 
    if (  pc->IsNotNullChunk()
+      && pc->IsNot(CT_ANGLE_CLOSE)
+      && pc->IsNot(CT_COND_COLON)                      // Issue #3920
       && pc->IsNot(CT_RETURN)
-      && pc->IsNot(CT_WORD)
-      && pc->IsNot(CT_TYPE)
       && pc->IsNot(CT_SQUARE_CLOSE)
-      && pc->IsNot(CT_ANGLE_CLOSE)
       && pc->IsNot(CT_TSQUARE)
+      && pc->IsNot(CT_TYPE)
+      && pc->IsNot(CT_WORD)
       && !pc->IsParenClose())
    {
       remove_semicolon(semi);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/semicolons.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/semicolons.h
index 19591574..60839e67 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/semicolons.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/semicolons.h
@@ -1,6 +1,6 @@
 /**
  * @file semicolons.h
- * prototypes for semicolons.c
+ * prototypes for semicolons.cpp
  *
  * @author  Ben Gardner
  * @license GPL v2+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/sorting.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/sorting.cpp
index 27152101..807e0739 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/sorting.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/sorting.cpp
@@ -169,10 +169,10 @@ static bool text_contains_filename_without_ext(const char *text)
 /**
  * Get chunk text without the extension.
  */
-static unc_text get_text_without_ext(const unc_text &chunk_text)
+static UncText get_text_without_ext(const UncText &chunk_text)
 {
-   unc_text result = chunk_text;
-   int      idx    = result.rfind(".", result.size() - 1);
+   UncText result = chunk_text;
+   int     idx    = result.rfind(".", result.size() - 1);
 
    if (idx == -1)
    {
@@ -184,9 +184,9 @@ static unc_text get_text_without_ext(const unc_text &chunk_text)
 
 
 /**
- * Returns true if unc_text has "." which implies extension.
+ * Returns true if UncText has "." which implies extension.
  */
-static bool has_dot(const unc_text &chunk_text)
+static bool has_dot(const UncText &chunk_text)
 {
    int idx = chunk_text.rfind(".", chunk_text.size() - 1);
 
@@ -197,11 +197,11 @@ static bool has_dot(const unc_text &chunk_text)
 /**
  * Returns chunk string required for sorting.
  */
-static unc_text chunk_sort_str(Chunk *pc)
+static UncText chunk_sort_str(Chunk *pc)
 {
    if (pc->GetParentType() == CT_PP_INCLUDE)
    {
-      return(unc_text{ pc->GetStr(), 0, pc->Len() - 1 });
+      return(UncText{ pc->GetStr(), 0, pc->Len() - 1 });
    }
    return(pc->GetStr());
 }
@@ -294,7 +294,7 @@ static int compare_chunks(Chunk *pc1, Chunk *pc2, bool tcare)
       LOG_FMT(LSORT, "%s(%d): text is %s, pc2->len is %zu, line is %zu, column is %zu\n",
               __func__, __LINE__, pc2->Text(), pc2->Len(), pc2->GetOrigLine(), pc2->GetOrigCol());
 
-      int ret_val = unc_text::compare(s1, s2, std::min(s1.size(), s2.size()), tcare);
+      int ret_val = UncText::compare(s1, s2, std::min(s1.size(), s2.size()), tcare);
       LOG_FMT(LSORT, "%s(%d): ret_val is %d\n",
               __func__, __LINE__, ret_val);
 
@@ -333,7 +333,7 @@ static int compare_chunks(Chunk *pc1, Chunk *pc2, bool tcare)
       LOG_FMT(LSORT, "%s(%d): >>>text is %s, pc2->len is %zu, line is %zu, column is %zu\n",
               __func__, __LINE__, pc2->Text(), pc2->Len(), pc2->GetOrigLine(), pc2->GetOrigCol());
 
-      // If we hit a newline or nullptr, we are done
+      // If we hit a newline or null chuck, we are done
       if (  pc1->IsNullChunk()
          || pc1->IsNewline()
          || pc2->IsNullChunk()
@@ -480,7 +480,7 @@ static void dedupe_imports(Chunk **chunks, size_t num_chunks)
       {
          continue;
       }
-      int ret_val = unc_text::compare(s1, s2, std::min(s1.size(), s2.size()), options::mod_sort_case_sensitive());
+      int ret_val = UncText::compare(s1, s2, std::min(s1.size(), s2.size()), options::mod_sort_case_sensitive());
 
       if (ret_val == 0)
       {
@@ -594,9 +594,9 @@ void sort_imports()
 
    Chunk     *chunks[max_number_to_sort];
    size_t    num_chunks  = 0;
-   Chunk     *p_last     = nullptr;
-   Chunk     *p_imp      = nullptr;
-   Chunk     *p_imp_last = nullptr;
+   Chunk     *p_last     = Chunk::NullChunkPtr;
+   Chunk     *p_imp      = Chunk::NullChunkPtr;
+   Chunk     *p_imp_last = Chunk::NullChunkPtr;
 
    prepare_categories();
 
@@ -609,7 +609,7 @@ void sort_imports()
       // Simple optimization to limit the sorting. Any MAX_LINES_TO_CHECK_AFTER_INCLUDE lines after last
       // import is seen are ignore from sorting.
       if (  options::mod_sort_incl_import_grouping_enabled()
-         && p_imp_last != nullptr
+         && p_imp_last->IsNotNullChunk()
          && (pc->GetOrigLine() - p_imp_last->GetOrigLine()) > max_lines_to_check_for_sort_after_include)
       {
          break;
@@ -620,9 +620,7 @@ void sort_imports()
       {
          bool did_import = false;
 
-         if (  p_imp != nullptr
-            && p_imp->IsNotNullChunk()
-            && p_last != nullptr
+         if (  p_imp->IsNotNullChunk()
             && (  p_last->Is(CT_SEMICOLON)
                || p_imp->TestFlags(PCF_IN_PREPROC)))
          {
@@ -647,7 +645,7 @@ void sort_imports()
             || (  !options::mod_sort_incl_import_grouping_enabled()
                && pc->GetNlCount() > 1)
             || (  options::mod_sort_incl_import_grouping_enabled()
-               && p_imp_last != nullptr
+               && p_imp_last->IsNotNullChunk()
                && (pc->GetOrigLine() - p_imp_last->GetOrigLine()) > max_gap_threshold_between_include_to_sort)
             || next->IsNullChunk())
          {
@@ -670,8 +668,8 @@ void sort_imports()
             num_chunks = 0;
          }
          p_imp_last = p_imp;
-         p_imp      = nullptr;
-         p_last     = nullptr;
+         p_imp      = Chunk::NullChunkPtr;
+         p_last     = Chunk::NullChunkPtr;
       }
       else if (pc->Is(CT_IMPORT))
       {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/sorting.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/sorting.h
index 8d518df8..8d518df8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/sorting.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/sorting.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/space.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/space.cpp
index 2e6dafde..ed85a4d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/space.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/space.cpp
@@ -13,7 +13,7 @@
  *   Rmk: spaces = space + nl
  *
  * @author  Ben Gardner
- * @author  Guy Maurel, 2015-2022
+ * @author  Guy Maurel, 2015-2023
  * @license GPL v2+
  */
 
@@ -33,17 +33,6 @@ using namespace uncrustify;
 
 
 /**
- * Decides how to change inter-chunk spacing.
- * Note that the order of the if statements is VERY important.
- *
- * @param first   The first chunk
- * @param second  The second chunk
- *
- * @return IARF_IGNORE, IARF_ADD, IARF_REMOVE or IARF_FORCE
- */
-static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp);
-
-/**
  * Ensure to force the space between the \a first and the \a second chunks
  * if the PCF_FORCE_SPACE flag is set in the \a first.
  *
@@ -63,11 +52,6 @@ bool token_is_within_trailing_return(Chunk *pc)
    //   or  CT_FPAREN_OPEN is found
    Chunk *prev = pc;
 
-   if (prev == nullptr)
-   {
-      prev = Chunk::NullChunkPtr;
-   }
-
    while (prev->IsNotNullChunk())
    {
       if (prev->Is(CT_TRAILING_RET))
@@ -75,7 +59,8 @@ bool token_is_within_trailing_return(Chunk *pc)
          return(true);
       }
       else if (  prev->Is(CT_FPAREN_CLOSE)
-              || prev->Is(CT_FPAREN_OPEN))
+              || prev->Is(CT_FPAREN_OPEN)
+              || prev->Is(CT_SEMICOLON))                     // Issue #4080
       {
          return(false);
       }
@@ -88,19 +73,54 @@ bool token_is_within_trailing_return(Chunk *pc)
 } // token_is_within_trailing_return
 
 
-/*
- * this function is called for every chunk in the input file.
- * Thus it is important to keep this function efficient
+/**
+ * Decides how to change inter-chunk spacing.
+ * Note that the order of the if statements is VERY important.
+ *
+ * @param first   The first chunk
+ * @param second  The second chunk
+ *
+ * @return IARF_IGNORE, IARF_ADD, IARF_REMOVE or IARF_FORCE
+ *
+ * This function is called for every chunk in the input file,
+ * thus it is important to keep this function efficient
  */
 static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
 {
    LOG_FUNC_ENTRY();
 
-   LOG_FMT(LSPACE, "%s(%d): orig line is %zu, orig col is %zu, first Text() '%s', type is %s\n",
+   LOG_FMT(LSPACE, "%s(%d): orig line %zu, orig col %zu, first text '%s', type %s\n",
            __func__, __LINE__, first->GetOrigLine(), first->GetOrigCol(), first->Text(), get_token_name(first->GetType()));
 
    min_sp = 1;
 
+   if (  first->Is(CT_VBRACE_OPEN)
+      && first->GetPrev()->Is(CT_SPAREN_CLOSE)
+      && second->IsNot(CT_SEMICOLON))
+   {
+      // Add or remove space after ')' of control statements.
+      log_rule("sp_after_sparen");
+      return(options::sp_after_sparen());
+   }
+
+   if (first->Is(CT_SPAREN_CLOSE))
+   {
+      if (second->Is(CT_VBRACE_OPEN))
+      {
+         // Fix spacing between SPAREN_CLOSE and VBRACE_OPEN tokens as we don't want the default behavior (which is ADD).
+         log_rule("REMOVE");
+         return(IARF_REMOVE);
+      }
+
+      if (  options::sp_sparen_brace() == IARF_IGNORE
+         && second->Is(CT_BRACE_OPEN))
+      {
+         // Do sp_after_sparen if sp_sparen_brace is ignored. No need for VBRACE_OPEN spacing.
+         log_rule("sp_after_sparen");
+         return(options::sp_after_sparen());
+      }
+   }
+
    if (  first->Is(CT_PP_IGNORE)
       && second->Is(CT_PP_IGNORE))
    {
@@ -358,6 +378,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          return(options::sp_before_semi());
       }
 
+      // Issue #4094-03
       if (second->GetParentType() == CT_FOR)
       {
          if (first->Is(CT_SPAREN_OPEN))
@@ -406,7 +427,14 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       && (  first->Is(CT_PP_ELSE)
          || first->Is(CT_PP_ENDIF)))
    {
-      second->SetType(CT_COMMENT_ENDIF);
+      if (second->Is(CT_COMMENT_CPP))
+      {
+         second->SetType(CT_COMMENT_CPP_ENDIF);
+      }
+      else
+      {
+         second->SetType(CT_COMMENT_ENDIF);
+      }
       // Add or remove space between #else or #endif and a trailing comment.
       log_rule("sp_endif_cmt");
       return(options::sp_endif_cmt());
@@ -440,6 +468,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       }
    }
 
+   // Issue #4094-05
    // "for (;;)" vs. "for (;; )" and "for (a;b;c)" vs. "for (a; b; c)"
    if (first->Is(CT_SEMICOLON))                        // see the tests cpp:34517-34519
    {
@@ -928,6 +957,15 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
 
    if (first->Is(CT_LPAREN_OPEN))
    {
+      if (second->Is(CT_LPAREN_CLOSE))
+      {
+         // 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> ){ ... }'
+         // with an empty list.
+         log_rule("sp_cpp_lambda_argument_list_empty");
+         return(options::sp_cpp_lambda_argument_list_empty());
+      }
       // 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");
@@ -1109,26 +1147,32 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_assign());
    }
 
-   if (first->Is(CT_BIT_COLON))
+   if (first->Is(CT_ENUM_COLON))                      // Issue #4040
    {
-      if (  first->TestFlags(PCF_IN_ENUM)
-         || first->GetParentType() == CT_ENUM)
-      {
-         // Add or remove space around assignment ':' in enum.
-         log_rule("sp_enum_colon");
-         return(options::sp_enum_colon());
-      }
+      // Add or remove space around assignment ':' in enum.
+      log_rule("sp_enum_colon");
+      return(options::sp_enum_colon());
    }
 
-   if (second->Is(CT_BIT_COLON))
+   if (second->Is(CT_ENUM_COLON))                    // Issue #4040
    {
-      if (  second->TestFlags(PCF_IN_ENUM)
-         || second->GetParentType() == CT_ENUM)
-      {
-         // Add or remove space around assignment ':' in enum.
-         log_rule("sp_enum_colon");
-         return(options::sp_enum_colon());
-      }
+      // Add or remove space around assignment ':' in enum.
+      log_rule("sp_enum_colon");
+      return(options::sp_enum_colon());
+   }
+
+   if (first->Is(CT_BIT_COLON))                      // Issue #4040
+   {
+      // Add or remove space after a bit colon ':'.
+      log_rule("sp_after_bit_colon");
+      return(options::sp_after_bit_colon());
+   }
+
+   if (second->Is(CT_BIT_COLON))                    // Issue #4040
+   {
+      // Add or remove space before a bit colon ':'.
+      log_rule("sp_before_bit_colon");
+      return(options::sp_before_bit_colon());
    }
 
    if (  first->Is(CT_OC_AVAILABLE_VALUE)
@@ -1235,6 +1279,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_angle_shift());
    }
 
+   // Issue #4094-01
    // spacing around template < > stuff
    if (  first->Is(CT_ANGLE_OPEN)
       || second->Is(CT_ANGLE_CLOSE))
@@ -1243,6 +1288,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          && second->Is(CT_ANGLE_CLOSE))
       {
          // Add or remove space inside '<>'.
+         // if empty.
          log_rule("sp_inside_angle_empty");
          return(options::sp_inside_angle_empty());
       }
@@ -1291,6 +1337,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          return(options::sp_angle_word());
       }
 
+      // Issue #4094-02
       if (  second->Is(CT_FPAREN_OPEN)
          || second->Is(CT_PAREN_OPEN))
       {
@@ -1405,6 +1452,14 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
             return(options::sp_before_byref());
          }
       }
+
+      if (first->Is(CT_PTR_TYPE))
+      {
+         // Add or remove space between pointer and Ref.
+         // as in 'int *& a'.
+         log_rule("sp_between_ptr_ref");                           // ptr_ref 1
+         return(options::sp_between_ptr_ref());
+      }
       // Add or remove space before a reference sign '&'.
       log_rule("sp_before_byref");                                 // byref 3
       return(options::sp_before_byref());
@@ -1443,16 +1498,9 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
             return(options::sp_sparen_brace());
          }
       }
-
-      if (  !second->IsComment()
-         && (options::sp_after_sparen() != IARF_IGNORE))
-      {
-         // Add or remove space after ')' of control statements.
-         log_rule("sp_after_sparen");
-         return(options::sp_after_sparen());
-      }
    }
 
+   // Issue #4094-07
    if (  second->Is(CT_FPAREN_OPEN)
       && first->GetParentType() == CT_OPERATOR
       && (options::sp_after_operator_sym() != IARF_IGNORE))
@@ -1506,6 +1554,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(IARF_IGNORE);
    }
 
+   // Issue #4094-11
    // spaces between function and open paren
    if (  first->Is(CT_FUNC_CALL)
       || first->Is(CT_FUNCTION)                        // Issue #2665
@@ -1554,6 +1603,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_attribute_paren());
    }
 
+   // Issue #4094-10
    if (first->Is(CT_FUNC_DEF))
    {
       if (  (options::sp_func_def_paren_empty() != IARF_IGNORE)
@@ -1564,7 +1614,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          if (next->Is(CT_FPAREN_CLOSE))
          {
             // Add or remove space between function name and '()' on function definition
-            // without parameters.
+            // if empty.
             log_rule("sp_func_def_paren_empty");
             return(options::sp_func_def_paren_empty());
          }
@@ -1629,6 +1679,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_cparen_oparen());
    }
 
+   // Issue #4094-09
    if (  first->Is(CT_FUNC_PROTO)
       || (  second->Is(CT_FPAREN_OPEN)
          && second->GetParentType() == CT_FUNC_PROTO))
@@ -1641,7 +1692,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          if (next->Is(CT_FPAREN_CLOSE))
          {
             // Add or remove space between function name and '()' on function declaration
-            // without parameters.
+            // if empty.
             log_rule("sp_func_proto_paren_empty");
             return(options::sp_func_proto_paren_empty());
          }
@@ -1660,6 +1711,7 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_func_type_paren());
    }
 
+   // Issue #4094-12
    if (  first->Is(CT_FUNC_CLASS_DEF)
       || first->Is(CT_FUNC_CLASS_PROTO))
    {
@@ -1689,10 +1741,12 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(IARF_FORCE);
    }
 
+   // Issue #4094-08
    if (  first->Is(CT_BRACE_OPEN)
       && second->Is(CT_BRACE_CLOSE))
    {
       // Add or remove space inside '{}'.
+      // if empty.
       log_rule("sp_inside_braces_empty");
       return(options::sp_inside_braces_empty());
    }
@@ -2076,6 +2130,32 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_inside_fparen());
    }
 
+   // functor "foo(...)" vs. "foo( ... )"
+   if (  first->Is(CT_RPAREN_OPEN)
+      || second->Is(CT_RPAREN_CLOSE))                  // Issue #3914
+   {
+      if (  (first->GetParentType() == CT_FUNC_CALL_USER)
+         || (  (second->GetParentType() == CT_FUNC_CALL_USER)
+            && (  (first->Is(CT_WORD))
+               || (first->Is(CT_SQUARE_CLOSE)))))
+      {
+         // Add or remove space inside user function '(' and ')'.
+         log_rule("sp_func_call_user_inside_rparen");
+         return(options::sp_func_call_user_inside_rparen());
+      }
+
+      if (  first->Is(CT_RPAREN_OPEN)
+         && second->Is(CT_RPAREN_CLOSE))                  // Issue #3914
+      {
+         // Add or remove space inside empty function '()'.
+         log_rule("sp_inside_rparens");
+         return(options::sp_inside_rparens());
+      }
+      // Add or remove space inside function '(' and ')'.
+      log_rule("sp_inside_rparen");
+      return(options::sp_inside_rparen());
+   }
+
    // "foo(...)" vs. "foo( ... )"
    if (  first->Is(CT_TPAREN_OPEN)
       || second->Is(CT_TPAREN_CLOSE))
@@ -2221,10 +2301,12 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       return(options::sp_inside_paren());
    }
 
+   // Issue #4094-06
    if (  first->Is(CT_SQUARE_OPEN)
       && second->Is(CT_SQUARE_CLOSE))
    {
       // Add or remove space inside '[]'.
+      // if empty.
       log_rule("sp_inside_square_empty");
       return(options::sp_inside_square_empty());
    }
@@ -2503,6 +2585,13 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          log_rule("sp_between_ptr_star");                             // ptr_star 9
          return(options::sp_between_ptr_star());
       }
+      else if (second->Is(CT_BYREF))
+      {
+         // Add or remove space between pointer and Ref.
+         // as in 'int *& a'.
+         log_rule("sp_between_ptr_ref");                             // ptr_ref 1
+         return(options::sp_between_ptr_ref());
+      }
       else if (second->Is(CT_FUNC_VAR))
       {
          // Add or remove space between the pointer star '*' and the name of the
@@ -2586,35 +2675,55 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       // look back for '->' type is TRAILING_RET
       if (token_is_within_trailing_return(second))
       {
-         log_rule("sp_before_ptr_star_trailing");                     // ptr_star 7
-         return(options::sp_before_ptr_star_trailing());
+         if (first->Is(CT_QUALIFIER))
+         {
+            log_rule("sp_qualifier_ptr_star_trailing");
+            return(options::sp_qualifier_ptr_star_trailing());
+         }
+         else
+         {
+            log_rule("sp_before_ptr_star_trailing");                  // ptr_star 7
+            return(options::sp_before_ptr_star_trailing());
+         }
       }
+      // Find the next non-'*' chunk
+      Chunk *next = second;
 
-      // Add or remove space before a pointer star '*', if followed by a function
-      // prototype or function definition.
-      if (options::sp_before_ptr_star_func() != IARF_IGNORE)
+      do
       {
-         // Find the next non-'*' chunk
-         Chunk *next = second;
+         next = next->GetNext();
+      } while (next->Is(CT_PTR_TYPE));
 
-         do
-         {
-            next = next->GetNext();
-         } while (next->Is(CT_PTR_TYPE));
+      if (  next->Is(CT_FUNC_DEF)
+         || next->Is(CT_FUNC_PROTO))
+      {
+         // Add or remove space before a pointer star '*', if followed by a function
+         // prototype or function definition. If set to ignore, sp_before_ptr_star is
+         // used instead.
 
-         if (  next->Is(CT_FUNC_DEF)
-            || next->Is(CT_FUNC_PROTO))
+         if (first->Is(CT_QUALIFIER))
          {
-            log_rule("sp_before_ptr_star_func");                      // ptr_star 6
-            return(options::sp_before_ptr_star_func());
+            if (options::sp_qualifier_ptr_star_func() != IARF_IGNORE)
+            {
+               log_rule("sp_qualifier_ptr_star_func");
+               return(options::sp_qualifier_ptr_star_func());
+            }
+         }
+         else
+         {
+            if (options::sp_before_ptr_star_func() != IARF_IGNORE)
+            {
+               log_rule("sp_before_ptr_star_func");                   // ptr_star 6
+               return(options::sp_before_ptr_star_func());
+            }
          }
       }
-
-      // 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.
-      if (options::sp_before_unnamed_ptr_star() != IARF_IGNORE)
+      else
       {
-         Chunk *next = second->GetNextNc();
+         // 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.
+
+         next = second->GetNextNc();
 
          while (next->Is(CT_PTR_TYPE))
          {
@@ -2624,8 +2733,60 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          if (  next->IsNotNullChunk()
             && next->IsNot(CT_WORD))
          {
-            log_rule("sp_before_unnamed_ptr_star");                   // ptr_star 8
-            return(options::sp_before_unnamed_ptr_star());
+            if (first->Is(CT_QUALIFIER))
+            {
+               if (options::sp_qualifier_unnamed_ptr_star() != IARF_IGNORE)
+               {
+                  log_rule("sp_qualifier_unnamed_ptr_star");
+                  return(options::sp_qualifier_unnamed_ptr_star());
+               }
+            }
+            else
+            {
+               if (next->Is(CT_QUALIFIER))
+               {
+                  if (options::sp_before_qualifier_ptr_star() != IARF_IGNORE)
+                  {
+                     log_rule("sp_before_qualifier_ptr_star");        // ptr_star 11
+                     return(options::sp_before_qualifier_ptr_star());
+                  }
+               }
+               else if (next->Is(CT_OPERATOR))
+               {
+                  if (options::sp_before_operator_ptr_star() != IARF_IGNORE)
+                  {
+                     log_rule("sp_before_operator_ptr_star");         // ptr_star 14
+                     return(options::sp_before_operator_ptr_star());
+                  }
+               }
+               else if (next->Is(CT_DC_MEMBER))
+               {
+                  if (options::sp_before_global_scope_ptr_star() != IARF_IGNORE)
+                  {
+                     log_rule("sp_before_global_scope_ptr_star");     // ptr_star 13
+                     return(options::sp_before_global_scope_ptr_star());
+                  }
+               }
+               else
+               {
+                  Chunk *next_next = next->GetNextNc();
+
+                  if (next_next->IsNotNullChunk() && next_next->Is(CT_DC_MEMBER))
+                  {
+                     if (options::sp_before_scope_ptr_star() != IARF_IGNORE)
+                     {
+                        log_rule("sp_before_scope_ptr_star");         // ptr_star 12
+                        return(options::sp_before_scope_ptr_star());
+                     }
+                  }
+               }
+
+               if (options::sp_before_unnamed_ptr_star() != IARF_IGNORE)
+               {
+                  log_rule("sp_before_unnamed_ptr_star");             // ptr_star 8
+                  return(options::sp_before_unnamed_ptr_star());
+               }
+            }
          }
       }
 
@@ -3156,9 +3317,27 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
    }
 
    // =============================================================
+   // category 0
+   // this table lists out all combos where nothing is to do
+   // CT_UNKNOWN is a wildcard.
+   for (auto it : IGNORE_space_table)
+   {
+      if (  (  it.first == CT_UNKNOWN
+            || it.first == first->GetType())
+         && (  it.second == CT_UNKNOWN
+            || it.second == second->GetType()))
+      {
+         log_rule("IGNORE from IGNORE_space_table");
+         return(IARF_IGNORE);
+      }
+   }
+
+   // =============================================================
    // category 1
    // this table lists out all combos where a space should NOT be present
    // CT_UNKNOWN is a wildcard.
+   size_t number = 0;
+
    for (auto it : no_space_table)
    {
       if (  (  it.first == CT_UNKNOWN
@@ -3166,23 +3345,30 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
          && (  it.second == CT_UNKNOWN
             || it.second == second->GetType()))
       {
-         log_rule("REMOVE from no_space_table");
+         char text[80];
+         sprintf(text, "REMOVE from no_space_table @ %zu.", number);
+         log_rule(text);
          return(IARF_REMOVE);
       }
+      number++;
    }
 
    // =============================================================
    // category 2
    // this table lists out all combos where a space MUST be present
+   number = 0;
+
    for (auto it : add_space_table)
    {
       if (  it.first == first->GetType()
          && it.second == second->GetType())
       {
-         // TODO: if necessary create a new option
-         log_rule("ADD from add_space_table");
+         char text[80];
+         sprintf(text, "ADD from add_space_table @ %zu.", number);
+         log_rule(text);
          return(IARF_ADD);
       }
+      number++;
    }
 
    // Issue #2386
@@ -3200,6 +3386,29 @@ static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp)
       log_rule("IGNORE");
       return(IARF_IGNORE);
    }
+   //// TODO: if necessary create a new option
+   //if (  first->Is(CT_RPAREN_OPEN)
+   //   && second->Is(CT_RPAREN_CLOSE))
+   //{
+   //   log_rule("IGNORE");
+   //   return(IARF_IGNORE);
+   //}
+
+   //// TODO: if necessary create a new option
+   //if (  first->Is(CT_RPAREN_OPEN)
+   //   && second->Is(CT_UNKNOWN))
+   //{
+   //   log_rule("IGNORE");
+   //   return(IARF_IGNORE);
+   //}
+
+   //// TODO: if necessary create a new option
+   //if (  first->Is(CT_UNKNOWN)
+   //   && second->Is(CT_RPAREN_CLOSE))
+   //{
+   //   log_rule("IGNORE");
+   //   return(IARF_IGNORE);
+   //}
 
    if (  first->Is(CT_CASE_ELLIPSIS)
       && second->Is(CT_NUMBER))
@@ -3260,7 +3469,7 @@ static iarf_e ensure_force_space(Chunk *first, Chunk *second, iarf_e av)
 {
    if (first->TestFlags(PCF_FORCE_SPACE))
    {
-      LOG_FMT(LSPACE, "%s(%d): <force between '%s' and '%s'>\n",
+      LOG_FMT(LSPACE, "%s(%d): force between '%s' and '%s'\n",
               __func__, __LINE__, first->Text(), second->Text());
       return(av | IARF_ADD);
    }
@@ -3270,9 +3479,7 @@ static iarf_e ensure_force_space(Chunk *first, Chunk *second, iarf_e av)
 
 static iarf_e do_space_ensured(Chunk *first, Chunk *second, int &min_sp)
 {
-   iarf_e aa = ensure_force_space(first, second, do_space(first, second, min_sp));
-
-   return(aa);
+   return(ensure_force_space(first, second, do_space(first, second, min_sp)));
 }
 
 
@@ -3478,6 +3685,21 @@ void space_text()
          {
             int delta = min_sp;
 
+            // Handle the condition of a CT_VBRACE_OPEN with more complicated spacing mechanics.
+            if (  pc->Is(CT_VBRACE_OPEN)
+               && next->GetOrigCol() >= pc->GetPrev()->GetOrigCol())
+            {
+               delta = next->GetOrigCol() - pc->GetPrev()->GetOrigCol();
+
+               if ((delta - 1) < min_sp)
+               {
+                  column += min_sp;
+                  break;
+               }
+               column += (delta - 1);
+               break;
+            }
+
             if (  next->GetOrigCol() >= pc->GetOrigColEnd()
                && pc->GetOrigColEnd() != 0)
             {
@@ -3563,7 +3785,6 @@ void space_text()
             }
          }
          next->SetColumn(column);
-
          LOG_FMT(LSPACE, "%s(%d): orig line is %zu, orig col is %zu, pc-Text() '%s', type is %s\n",
                  __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), get_token_name(pc->GetType()));
          LOG_FMT(LSPACE, "%s(%d): ",
@@ -3666,11 +3887,11 @@ size_t space_col_align(Chunk *first, Chunk *second)
 {
    LOG_FUNC_ENTRY();
 
-   LOG_FMT(LSPACE, "%s(%d): first orig line is %zu, orig col is %zu, [%s/%s], Text() '%s' <==>\n",
+   LOG_FMT(LSPACE, "%s(%d): 1st orig line %zu, orig col %zu, [%s/%s], text '%s' <==>\n",
            __func__, __LINE__, first->GetOrigLine(), first->GetOrigCol(),
            get_token_name(first->GetType()), get_token_name(first->GetParentType()),
            first->Text());
-   LOG_FMT(LSPACE, "%s(%d): second orig line is %zu, orig col is %zu [%s/%s], Text() '%s',",
+   LOG_FMT(LSPACE, "%s(%d): 2nd orig line %zu, orig col %zu, [%s/%s], text '%s'\n",
            __func__, __LINE__, second->GetOrigLine(), second->GetOrigCol(),
            get_token_name(second->GetType()), get_token_name(second->GetParentType()),
            second->Text());
@@ -3682,14 +3903,15 @@ size_t space_col_align(Chunk *first, Chunk *second)
    LOG_FMT(LSPACE, "%s(%d): av is %s\n", __func__, __LINE__, to_string(av));
    size_t coldiff;
 
-   if (first->GetNlCount())
+   if (first->GetNlCount() > 0)
    {
-      LOG_FMT(LSPACE, "%s(%d):    new line count is %zu, orig col end is %zu\n", __func__, __LINE__, first->GetNlCount(), first->GetOrigColEnd());
+      LOG_FMT(LSPACE, "%s(%d):    new line count %zu, orig col end %zu\n",
+              __func__, __LINE__, first->GetNlCount(), first->GetOrigColEnd());
       coldiff = first->GetOrigColEnd() - 1;
    }
    else
    {
-      LOG_FMT(LSPACE, "%s(%d):    Len is %zu\n", __func__, __LINE__, first->Len());
+      LOG_FMT(LSPACE, "%s(%d):    '1st' len is %zu\n", __func__, __LINE__, first->Len());
       coldiff = first->Len();
    }
    LOG_FMT(LSPACE, "%s(%d):    => coldiff is %zu\n", __func__, __LINE__, coldiff);
@@ -3712,11 +3934,11 @@ size_t space_col_align(Chunk *first, Chunk *second)
    case IARF_IGNORE:                // Issue #2064
       LOG_FMT(LSPACE, "%s(%d):    => first orig line  is %zu\n", __func__, __LINE__, first->GetOrigLine());
       LOG_FMT(LSPACE, "%s(%d):    => second orig line is %zu\n", __func__, __LINE__, second->GetOrigLine());
-      LOG_FMT(LSPACE, "%s(%d):    => first Text()     is '%s'\n", __func__, __LINE__, first->Text());
-      LOG_FMT(LSPACE, "%s(%d):    => second Text()    is '%s'\n", __func__, __LINE__, second->Text());
+      LOG_FMT(LSPACE, "%s(%d):    => first text       is '%s'\n", __func__, __LINE__, first->Text());
+      LOG_FMT(LSPACE, "%s(%d):    => second text      is '%s'\n", __func__, __LINE__, second->Text());
       LOG_FMT(LSPACE, "%s(%d):    => first orig col   is %zu\n", __func__, __LINE__, first->GetOrigCol());
       LOG_FMT(LSPACE, "%s(%d):    => second orig col  is %zu\n", __func__, __LINE__, second->GetOrigCol());
-      LOG_FMT(LSPACE, "%s(%d):    => first Len()      is %zu\n", __func__, __LINE__, first->Len());
+      LOG_FMT(LSPACE, "%s(%d):    => first len        is %zu\n", __func__, __LINE__, first->Len());
 
       if (  first->GetOrigLine() == second->GetOrigLine()
          && second->GetOrigCol() > (first->GetOrigCol() + first->Len()))
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/space.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/space.h
index 275772f2..275772f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/space.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/space.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/symbols_table.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/symbols_table.h
index bcf7c8b2..bcf7c8b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/symbols_table.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/symbols_table.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/token_enum.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/token_enum.h
index e7caa5ba..6c912e07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/token_enum.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/token_enum.h
@@ -29,33 +29,34 @@ enum E_Token
    CT_EOF,
    CT_UNKNOWN,
 
-   CT_JUNK,          // junk collected when parsing is disabled
-
-   CT_WHITESPACE,    // whitespace without any newlines
-   CT_SPACE,         // a fixed number of spaces to support weird spacing rules
-   CT_NEWLINE,       // CRA, one or more newlines
-   CT_NL_CONT,       // CRA, backslash-newline
-   CT_FORM_FEED,     // character 12
-   CT_COMMENT_CPP,   // C++ comment (always followed by CT_NEWLINE)
-   CT_COMMENT,       // C-comment, single line
-   CT_COMMENT_MULTI, // Multi-lined comment
-   CT_COMMENT_EMBED, // comment parent_type: non-newline before and after
-   CT_COMMENT_START, // comment parent_type: newline before
-   CT_COMMENT_END,   // comment parent_type: newline after
-   CT_COMMENT_WHOLE, // comment parent_type: newline before and after
-   CT_COMMENT_ENDIF, // C-comment, single line, after ENDIF
-
-   CT_IGNORED,       // a chunk of ignored text
-
-   CT_WORD,          // variable, type, function name, etc
+   CT_JUNK,              // junk collected when parsing is disabled
+
+   CT_WHITESPACE,        // whitespace without any newlines
+   CT_SPACE,             // a fixed number of spaces to support weird spacing rules
+   CT_NEWLINE,           // CRA, one or more newlines
+   CT_NL_CONT,           // CRA, backslash-newline
+   CT_FORM_FEED,         // character 12
+   CT_COMMENT_CPP,       // C++ comment (always followed by CT_NEWLINE)
+   CT_COMMENT,           // C-comment, single line
+   CT_COMMENT_MULTI,     // Multi-lined comment
+   CT_COMMENT_EMBED,     // comment parent_type: non-newline before and after
+   CT_COMMENT_START,     // comment parent_type: newline before
+   CT_COMMENT_END,       // comment parent_type: newline after
+   CT_COMMENT_WHOLE,     // comment parent_type: newline before and after
+   CT_COMMENT_CPP_ENDIF, // C++ comment, single line, after #endif or #else
+   CT_COMMENT_ENDIF,     // C-comment, single line, after #endif or #else
+
+   CT_IGNORED,           // a chunk of ignored text
+
+   CT_WORD,              // variable, type, function name, etc
    CT_NUMBER,
    CT_NUMBER_FP,
-   CT_STRING,        // quoted string "hi" or 'a' or <in> for include
-   CT_STRING_MULTI,  // quoted string with embedded newline
-   CT_IF,            // built-in keywords
+   CT_STRING,            // quoted string "hi" or 'a' or <in> for include
+   CT_STRING_MULTI,      // quoted string with embedded newline
+   CT_IF,                // built-in keywords
    CT_ELSE,
    CT_ELSEIF,
-   CT_CONSTEXPR,     // only when preceded by 'if' (otherwise CT_QUALIFIER)
+   CT_CONSTEXPR,         // only when preceded by 'if' (otherwise CT_QUALIFIER)
    CT_FOR,
    CT_WHILE,
    CT_WHILE_OF_DO,
@@ -145,9 +146,9 @@ enum E_Token
    CT_CLASS_COLON,         // colon after a class def
    CT_CONSTR_COLON,        // colon after a constructor
    CT_D_ARRAY_COLON,       // D named array initializer colon
-   CT_COND_COLON,          // conditional colon in  'b ? t : f'
+   CT_COND_COLON,          // conditional colon in 'b ? t : f'
    CT_WHERE_COLON,         // C# where-constraint colon (after the type)
-   CT_QUESTION,
+   CT_QUESTION,            // conditional question in 'b ? t : f'
    CT_COMMA,
 
    CT_ASM,
@@ -220,6 +221,9 @@ enum E_Token
    CT_TPAREN_OPEN,      // 'type' parenthetis used in function types
    CT_TPAREN_CLOSE,
 
+   CT_RPAREN_OPEN,      // functor                                    Issue #3914
+   CT_RPAREN_CLOSE,
+
    CT_BRACE_OPEN,       // {...}
    CT_BRACE_CLOSE,
 
@@ -267,6 +271,7 @@ enum E_Token
    CT_TRAILING_RET,       // '->' in 'auto fname(...) -> type;'
                           // '->' in 'auto fname(...) const -> type;'
    CT_BIT_COLON,          // a ':' in a variable declaration
+   CT_ENUM_COLON,         // a ':' in a enum definition
 
    CT_OC_DYNAMIC,
    CT_OC_END,           // ObjC: @end
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/tokenize.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/tokenize.cpp
index 0aeafe63..846755fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/tokenize.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/tokenize.cpp
@@ -27,9 +27,9 @@ using namespace std;
 using namespace uncrustify;
 
 
-struct tok_info
+struct TokenInfo
 {
-   tok_info()
+   TokenInfo()
       : last_ch(0)
       , idx(0)
       , row(1)
@@ -44,9 +44,9 @@ struct tok_info
 };
 
 
-struct tok_ctx
+struct TokenContext
 {
-   tok_ctx(const deque<int> &d)
+   TokenContext(const deque<int> &d)
       : data(d)
    {
    }
@@ -59,7 +59,7 @@ struct tok_ctx
    }
 
 
-   void save(tok_info &info)
+   void save(TokenInfo &info)
    {
       info = c;
    }
@@ -72,7 +72,7 @@ struct tok_ctx
    }
 
 
-   void restore(const tok_info &info)
+   void restore(const TokenInfo &info)
    {
       c = info;
    }
@@ -147,8 +147,8 @@ struct tok_ctx
 
 
    const deque<int> &data;
-   tok_info         c; //! current
-   tok_info         s; //! saved
+   TokenInfo        c; //! current
+   TokenInfo        s; //! saved
 };
 
 
@@ -161,7 +161,7 @@ struct tok_ctx
  *
  * @return Whether a string was parsed
  */
-static bool parse_string(tok_ctx &ctx, Chunk &pc, size_t quote_idx, bool allow_escape);
+static bool parse_string(TokenContext &ctx, Chunk &pc, size_t quote_idx, bool allow_escape);
 
 
 /**
@@ -172,7 +172,7 @@ static bool parse_string(tok_ctx &ctx, Chunk &pc, size_t quote_idx, bool allow_e
  *
  * @return Whether a string was parsed
  */
-static bool parse_cs_string(tok_ctx &ctx, Chunk &pc);
+static bool parse_cs_string(TokenContext &ctx, Chunk &pc);
 
 
 /**
@@ -180,7 +180,7 @@ static bool parse_cs_string(tok_ctx &ctx, Chunk &pc);
  *
  * @param pc  The structure to update, str is an input.
  */
-static void parse_verbatim_string(tok_ctx &ctx, Chunk &pc);
+static void parse_verbatim_string(TokenContext &ctx, Chunk &pc);
 
 
 static bool tag_compare(const deque<int> &d, size_t a_idx, size_t b_idx, size_t len);
@@ -192,7 +192,7 @@ static bool tag_compare(const deque<int> &d, size_t a_idx, size_t b_idx, size_t
  *
  * @param pc  structure to update, str is an input.
  */
-static bool parse_cr_string(tok_ctx &ctx, Chunk &pc, size_t q_idx);
+static bool parse_cr_string(TokenContext &ctx, Chunk &pc, size_t q_idx);
 
 
 /**
@@ -202,7 +202,7 @@ static bool parse_cr_string(tok_ctx &ctx, Chunk &pc, size_t q_idx);
  *
  * @return Whether whitespace was parsed
  */
-static bool parse_whitespace(tok_ctx &ctx, Chunk &pc);
+static bool parse_whitespace(TokenContext &ctx, Chunk &pc);
 
 
 /**
@@ -212,7 +212,7 @@ static bool parse_whitespace(tok_ctx &ctx, Chunk &pc);
  *
  * @param pc  structure to update, str is an input
  */
-static bool parse_bs_newline(tok_ctx &ctx, Chunk &pc);
+static bool parse_bs_newline(TokenContext &ctx, Chunk &pc);
 
 
 /**
@@ -221,7 +221,7 @@ static bool parse_bs_newline(tok_ctx &ctx, Chunk &pc);
  * This is not the same as parse_whitespace() because it only consumes until
  * a single newline is encountered.
  */
-static bool parse_newline(tok_ctx &ctx);
+static bool parse_newline(TokenContext &ctx);
 
 
 /**
@@ -233,10 +233,10 @@ static bool parse_newline(tok_ctx &ctx);
  *
  * @param pc  structure to update, str is an input
  */
-static void parse_pawn_pattern(tok_ctx &ctx, Chunk &pc, E_Token tt);
+static void parse_pawn_pattern(TokenContext &ctx, Chunk &pc, E_Token tt);
 
 
-static bool parse_ignored(tok_ctx &ctx, Chunk &pc);
+static bool parse_ignored(TokenContext &ctx, Chunk &pc);
 
 
 /**
@@ -252,7 +252,7 @@ static bool parse_ignored(tok_ctx &ctx, Chunk &pc);
  *
  * @return true/false - whether anything was parsed
  */
-static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc);
+static bool parse_next(TokenContext &ctx, Chunk &pc, const Chunk *prev_pc);
 
 
 /**
@@ -277,7 +277,7 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc);
  *
  * @return Whether a string was parsed
  */
-static bool d_parse_string(tok_ctx &ctx, Chunk &pc);
+static bool d_parse_string(TokenContext &ctx, Chunk &pc);
 
 
 /**
@@ -292,7 +292,7 @@ static bool d_parse_string(tok_ctx &ctx, Chunk &pc);
  *
  * @return Whether a comment was parsed
  */
-static bool parse_comment(tok_ctx &ctx, Chunk &pc);
+static bool parse_comment(TokenContext &ctx, Chunk &pc);
 
 
 /**
@@ -303,7 +303,7 @@ static bool parse_comment(tok_ctx &ctx, Chunk &pc);
  *
  * @return Whether a placeholder was parsed.
  */
-static bool parse_code_placeholder(tok_ctx &ctx, Chunk &pc);
+static bool parse_code_placeholder(TokenContext &ctx, Chunk &pc);
 
 
 /**
@@ -311,7 +311,7 @@ static bool parse_code_placeholder(tok_ctx &ctx, Chunk &pc);
  * If for a string, explicitly exclude common format and scan specifiers, ie,
  * PRIx32 and SCNx64.
  */
-static void parse_suffix(tok_ctx &ctx, Chunk &pc, bool forstring);
+static void parse_suffix(TokenContext &ctx, Chunk &pc, bool forstring);
 
 
 //! check if a symbol holds a boolean value
@@ -350,27 +350,27 @@ static bool is_hex_(int ch);
  *
  * @return Whether a number was parsed
  */
-static bool parse_number(tok_ctx &ctx, Chunk &pc);
+static bool parse_number(TokenContext &ctx, Chunk &pc);
 
 
-static bool d_parse_string(tok_ctx &ctx, Chunk &pc)
+static bool d_parse_string(TokenContext &ctx, Chunk &pc)
 {
    size_t ch = ctx.peek();
 
-   if (  ch == '"'
-      || ch == '\'')
+   if (  ch == '"'             // 34
+      || ch == '\'')           // 39
    {
       return(parse_string(ctx, pc, 0, true));
    }
 
-   if (ch == '`')
+   if (ch == '`')              // 96
    {
       return(parse_string(ctx, pc, 0, false));
    }
 
-   if (  (  ch == 'r'
-         || ch == 'x')
-      && ctx.peek(1) == '"')
+   if (  (  ch == 'r'          // 114
+         || ch == 'x')         // 120
+      && ctx.peek(1) == '"')   //  34
    {
       return(parse_string(ctx, pc, 1, false));
    }
@@ -384,7 +384,7 @@ static bool d_parse_string(tok_ctx &ctx, Chunk &pc)
 
    pc.Str().clear();
 
-   while (ctx.peek() == '\\')
+   while (ctx.peek() == '\\')   // 92
    {
       pc.Str().append(ctx.get());
 
@@ -453,7 +453,7 @@ static bool d_parse_string(tok_ctx &ctx, Chunk &pc)
             pc.Str().append(ctx.get());
          }
 
-         if (ctx.peek() == ';')
+         if (ctx.peek() == ';')          // 59
          {
             pc.Str().append(ctx.get());
          }
@@ -497,7 +497,7 @@ static const char *str_search(const char *needle, const char *haystack, int hays
 #endif
 
 
-static bool parse_comment(tok_ctx &ctx, Chunk &pc)
+static bool parse_comment(TokenContext &ctx, Chunk &pc)
 {
    bool   is_d    = language_is_set(LANG_D);
    bool   is_cs   = language_is_set(LANG_CS);
@@ -520,7 +520,7 @@ static bool parse_comment(tok_ctx &ctx, Chunk &pc)
 
    pc.Str().append(ch);    // second char
 
-   if (ch == '/')
+   if (ch == '/')          // 47
    {
       pc.SetType(CT_COMMENT_CPP);
 
@@ -538,8 +538,8 @@ static bool parse_comment(tok_ctx &ctx, Chunk &pc)
                break;
             }
 
-            if (  (ch == '\\')
-               && !is_cs) // backslashes aren't special in comments in C#
+            if (  (ch == '\\') // 92
+               && !is_cs)      // backslashes aren't special in comments in C#
             {
                bs_cnt++;
             }
@@ -579,7 +579,7 @@ static bool parse_comment(tok_ctx &ctx, Chunk &pc)
       ctx.restore();
       return(false);
    }
-   else if (ch == '+')
+   else if (ch == '+')                         // 43
    {
       pc.SetType(CT_COMMENT);
       d_level++;
@@ -587,8 +587,8 @@ static bool parse_comment(tok_ctx &ctx, Chunk &pc)
       while (  d_level > 0
             && ctx.more())
       {
-         if (  (ctx.peek() == '+')
-            && (ctx.peek(1) == '/'))
+         if (  (ctx.peek() == '+')             // 43
+            && (ctx.peek(1) == '/'))           // 47
          {
             pc.Str().append(ctx.get());  // store the '+'
             pc.Str().append(ctx.get());  // store the '/'
@@ -596,8 +596,8 @@ static bool parse_comment(tok_ctx &ctx, Chunk &pc)
             continue;
          }
 
-         if (  (ctx.peek() == '/')
-            && (ctx.peek(1) == '+'))
+         if (  (ctx.peek() == '/')           // 47
+            && (ctx.peek(1) == '+'))         // 43
          {
             pc.Str().append(ctx.get());  // store the '/'
             pc.Str().append(ctx.get());  // store the '+'
@@ -638,19 +638,19 @@ static bool parse_comment(tok_ctx &ctx, Chunk &pc)
 
       while (ctx.more())
       {
-         if (  (ctx.peek() == '*')
-            && (ctx.peek(1) == '/'))
+         if (  (ctx.peek() == '*')         // 43
+            && (ctx.peek(1) == '/'))       // 47
          {
             pc.Str().append(ctx.get());  // store the '*'
             pc.Str().append(ctx.get());  // store the '/'
 
-            tok_info ss;
+            TokenInfo ss;
             ctx.save(ss);
-            size_t   oldsize = pc.GetStr().size();
+            size_t    oldsize = pc.GetStr().size();
 
             // If there is another C comment right after this one, combine them
-            while (  (ctx.peek() == ' ')
-                  || (ctx.peek() == '\t'))
+            while (  (ctx.peek() == ' ')         // 32
+                  || (ctx.peek() == '\t'))       // tab
             {
                pc.Str().append(ctx.get());
             }
@@ -736,7 +736,7 @@ static bool parse_comment(tok_ctx &ctx, Chunk &pc)
 } // parse_comment
 
 
-static bool parse_code_placeholder(tok_ctx &ctx, Chunk &pc)
+static bool parse_code_placeholder(TokenContext &ctx, Chunk &pc)
 {
    if (  (ctx.peek() != '<')
       || (ctx.peek(1) != '#'))
@@ -758,8 +758,8 @@ static bool parse_code_placeholder(tok_ctx &ctx, Chunk &pc)
       last1 = ctx.get();
       pc.Str().append(last1);
 
-      if (  (last2 == '#')
-         && (last1 == '>'))
+      if (  (last2 == '#')            // 35
+         && (last1 == '>'))           // 62
       {
          pc.SetType(CT_WORD);
          return(true);
@@ -770,7 +770,7 @@ static bool parse_code_placeholder(tok_ctx &ctx, Chunk &pc)
 }
 
 
-static void parse_suffix(tok_ctx &ctx, Chunk &pc, bool forstring = false)
+static void parse_suffix(TokenContext &ctx, Chunk &pc, bool forstring = false)
 {
    if (CharTable::IsKw1(ctx.peek()))
    {
@@ -782,15 +782,15 @@ static void parse_suffix(tok_ctx &ctx, Chunk &pc, bool forstring = false)
       size_t p2 = ctx.peek(1);
 
       if (  forstring
-         && (  (  (p1 == 'L')
-               && (  (p2 == '"')
-                  || (p2 == '\'')))
-            || (  (p1 == 'S')
-               && (p2 == '"'))))
+         && (  (  (p1 == 'L')          // 76
+               && (  (p2 == '"')       // 34
+                  || (p2 == '\'')))    // 39
+            || (  (p1 == 'S')          // 83
+               && (p2 == '"'))))       // 34
       {
          return;
       }
-      tok_info ss;
+      TokenInfo ss;
       ctx.save(ss);
 
       while (  ctx.more()
@@ -809,43 +809,43 @@ static void parse_suffix(tok_ctx &ctx, Chunk &pc, bool forstring = false)
          pc.Str().resize(oldsize);
       }
    }
-}
+} // parse_suffix
 
 
 static bool is_bin(int ch)
 {
-   return(  (ch == '0')
-         || (ch == '1'));
+   return(  (ch == '0')           // 48
+         || (ch == '1'));         // 49
 }
 
 
 static bool is_bin_(int ch)
 {
    return(  is_bin(ch)
-         || ch == '_'
-         || ch == '\'');
+         || ch == '_'            // 95
+         || ch == '\'');         // 39
 }
 
 
 static bool is_oct(int ch)
 {
-   return(  (ch >= '0')
-         && (ch <= '7'));
+   return(  (ch >= '0')         // 48
+         && (ch <= '7'));       // 55
 }
 
 
 static bool is_oct_(int ch)
 {
    return(  is_oct(ch)
-         || ch == '_'
-         || ch == '\'');
+         || ch == '_'            // 95
+         || ch == '\'');         // 39
 }
 
 
 static bool is_dec(int ch)
 {
-   return(  (ch >= '0')
-         && (ch <= '9'));
+   return(  (ch >= '0')          // 48
+         && (ch <= '9'));        // 57
 }
 
 
@@ -853,46 +853,46 @@ static bool is_dec_(int ch)
 {
    // number separators: JAVA: "_", C++14: "'"
    return(  is_dec(ch)
-         || (ch == '_')
-         || (ch == '\''));
+         || (ch == '_')           // 95
+         || (ch == '\''));        // 39
 }
 
 
 static bool is_hex(int ch)
 {
-   return(  (  (ch >= '0')
-            && (ch <= '9'))
-         || (  (ch >= 'a')
-            && (ch <= 'f'))
-         || (  (ch >= 'A')
-            && (ch <= 'F')));
+   return(  (  (ch >= '0')            // 48
+            && (ch <= '9'))           // 57
+         || (  (ch >= 'a')            // 97
+            && (ch <= 'f'))           // 102
+         || (  (ch >= 'A')            // 65
+            && (ch <= 'F')));         // 70
 }
 
 
 static bool is_hex_(int ch)
 {
    return(  is_hex(ch)
-         || ch == '_'
-         || ch == '\'');
+         || ch == '_'              // 95
+         || ch == '\'');           // 39
 }
 
 
-static bool parse_number(tok_ctx &ctx, Chunk &pc)
+static bool parse_number(TokenContext &ctx, Chunk &pc)
 {
    /*
     * A number must start with a digit or a dot, followed by a digit
     * (signs handled elsewhere)
     */
    if (  !is_dec(ctx.peek())
-      && (  (ctx.peek() != '.')
+      && (  (ctx.peek() != '.')         // 46
          || !is_dec(ctx.peek(1))))
    {
       return(false);
    }
-   bool is_float = (ctx.peek() == '.');
+   bool is_float = (ctx.peek() == '.');         // 46
 
    if (  is_float
-      && (ctx.peek(1) == '.')) // make sure it isn't '..'
+      && (ctx.peek(1) == '.')) // make sure it isn't '..'  46
    {
       return(false);
    }
@@ -904,7 +904,7 @@ static bool parse_number(tok_ctx &ctx, Chunk &pc)
     */
    bool did_hex = false;
 
-   if (  ctx.peek() == '0'
+   if (  ctx.peek() == '0'                   // 48
       && !language_is_set(LANG_CS))
    {
       size_t ch;
@@ -924,12 +924,12 @@ static bool parse_number(tok_ctx &ctx, Chunk &pc)
       }
       ch = pc_temp.GetStr()[pc_temp.Len() - 1];
       ctx.restore();
-      LOG_FMT(LGUY, "%s(%d): pc_temp:%s\n", __func__, __LINE__, pc_temp.Text());
+      LOG_FMT(LBCTRL, "%s(%d): pc_temp:%s\n", __func__, __LINE__, pc_temp.Text());
 
-      if (ch == 'h') // TODO can we combine this in analyze_character
+      if (ch == 'h') // TODO can we combine this in analyze_character  104
       {
          // we have an MS hexadecimal number with "h" at the end
-         LOG_FMT(LGUY, "%s(%d): MS hexadecimal number\n", __func__, __LINE__);
+         LOG_FMT(LBCTRL, "%s(%d): MS hexadecimal number\n", __func__, __LINE__);
          did_hex = true;
 
          do
@@ -938,7 +938,7 @@ static bool parse_number(tok_ctx &ctx, Chunk &pc)
          } while (is_hex_(ctx.peek()));
 
          pc.Str().append(ctx.get());    // store the h
-         LOG_FMT(LGUY, "%s(%d): pc:%s\n", __func__, __LINE__, pc.Text());
+         LOG_FMT(LBCTRL, "%s(%d): pc:%s\n", __func__, __LINE__, pc.Text());
       }
       else
       {
@@ -997,11 +997,11 @@ static bool parse_number(tok_ctx &ctx, Chunk &pc)
    }
 
    // Check if we stopped on a decimal point & make sure it isn't '..'
-   if (  (ctx.peek() == '.')
-      && (ctx.peek(1) != '.'))
+   if (  (ctx.peek() == '.')                 // 46
+      && (ctx.peek(1) != '.'))               // 46
    {
       // Issue #1265, 5.clamp()
-      tok_info ss;
+      TokenInfo ss;
       ctx.save(ss);
 
       while (  ctx.more()
@@ -1011,7 +1011,7 @@ static bool parse_number(tok_ctx &ctx, Chunk &pc)
          ctx.get();
       }
 
-      if (ctx.peek(1) == '(')
+      if (ctx.peek(1) == '(')                // 40
       {
          ctx.restore(ss);
          pc.SetType(CT_NUMBER);
@@ -1047,14 +1047,14 @@ static bool parse_number(tok_ctx &ctx, Chunk &pc)
     */
    size_t tmp = unc_toupper(ctx.peek());
 
-   if (  (tmp == 'E')
-      || (tmp == 'P'))
+   if (  (tmp == 'E')                 // 69
+      || (tmp == 'P'))                // 80
    {
       is_float = true;
       pc.Str().append(ctx.get());
 
-      if (  (ctx.peek() == '+')
-         || (ctx.peek() == '-'))
+      if (  (ctx.peek() == '+')          // 43
+         || (ctx.peek() == '-'))         // 45
       {
          pc.Str().append(ctx.get());
       }
@@ -1081,30 +1081,85 @@ static bool parse_number(tok_ctx &ctx, Chunk &pc)
    {
       size_t tmp2 = unc_toupper(ctx.peek());
 
-      if (  (tmp2 == 'I')
-         || (tmp2 == 'F')
-         || (tmp2 == 'D')
-         || (tmp2 == 'M'))
+      // https://en.cppreference.com/w/cpp/language/floating_literal
+      if (  (tmp2 == 'I')    // 73
+         || (tmp2 == 'F')    // 70
+         || (tmp2 == 'D')    // 68
+         || (tmp2 == 'M'))   // 77
       {
-         is_float = true;
+         // is a decimal point found?                     Issue #4027
+         const char *test_it    = pc.Text();
+         size_t     test_long   = strlen(test_it);
+         bool       point_found = false;
+
+         for (size_t ind = 0; ind < test_long; ind++)
+         {
+            if (test_it[ind] == '.')
+            {
+               point_found = true;
+               break;
+            }
+         }
+
+         if (point_found)
+         {
+            is_float = true;
+         }
+         else
+         {
+            // append the char(s) until is not IsKw2
+            while (ctx.more())
+            {
+               size_t ch = ctx.peek();
+
+               if (CharTable::IsKw2(ch))
+               {
+                  pc.Str().append(ctx.get());
+               }
+               else
+               {
+                  break;
+               }
+            }
+            pc.SetType(CT_WORD);
+            return(true);
+         }
       }
-      else if (  (tmp2 != 'L')
-              && (tmp2 != 'U'))
+      else if (  (tmp2 != 'L')   // 76
+              && (tmp2 != 'U'))  // 85
       {
          break;
       }
       pc.Str().append(ctx.get());
    }
 
-   // skip the Microsoft-specific '32' and '64' suffix
-   if (  (  (ctx.peek() == '3')
-         && (ctx.peek(1) == '2'))
-      || (  (ctx.peek() == '6')
-         && (ctx.peek(1) == '4')))
+   // skip the Microsoft-specific '8' suffix
+   if ((ctx.peek() == '8'))      // 56
+   {
+      pc.Str().append(ctx.get());
+   }
+
+   // skip the Microsoft-specific '16', '32' and '64' suffix
+   if (  (  (ctx.peek() == '1')     // 49
+         && (ctx.peek(1) == '6'))   // 54
+      || (  (ctx.peek() == '3')     // 51
+         && (ctx.peek(1) == '2'))   // 50
+      || (  (ctx.peek() == '6')     // 54
+         && (ctx.peek(1) == '4')))  // 52
    {
       pc.Str().append(ctx.get());
       pc.Str().append(ctx.get());
    }
+
+   // skip the Microsoft-specific '128' suffix
+   if ((  (ctx.peek() == '1')      // 49
+       && (ctx.peek(1) == '2')     // 50
+       && (ctx.peek(2) == '8')))   // 56
+   {
+      pc.Str().append(ctx.get());
+      pc.Str().append(ctx.get());
+      pc.Str().append(ctx.get());
+   }
    pc.SetType(is_float ? CT_NUMBER_FP : CT_NUMBER);
 
    /*
@@ -1117,7 +1172,7 @@ static bool parse_number(tok_ctx &ctx, Chunk &pc)
 } // parse_number
 
 
-static bool parse_string(tok_ctx &ctx, Chunk &pc, size_t quote_idx, bool allow_escape)
+static bool parse_string(TokenContext &ctx, Chunk &pc, size_t quote_idx, bool allow_escape)
 {
    log_rule_B("string_escape_char");
    const size_t escape_char = options::string_escape_char();
@@ -1219,24 +1274,24 @@ static cs_string_t operator|=(cs_string_t &value, cs_string_t other)
 }
 
 
-static cs_string_t parse_cs_string_start(tok_ctx &ctx, Chunk &pc)
+static cs_string_t parse_cs_string_start(TokenContext &ctx, Chunk &pc)
 {
    cs_string_t stringType = CS_STRING_NONE;
    int         offset     = 0;
 
-   if (ctx.peek(offset) == '$')
+   if (ctx.peek(offset) == '$')                     // 36
    {
       stringType |= CS_STRING_INTERPOLATED;
       ++offset;
    }
 
-   if (ctx.peek(offset) == '@')
+   if (ctx.peek(offset) == '@')                     // 64
    {
       stringType |= CS_STRING_VERBATIM;
       ++offset;
    }
 
-   if (ctx.peek(offset) == '"')
+   if (ctx.peek(offset) == '"')                     // 34
    {
       stringType |= CS_STRING_STRING;
 
@@ -1272,11 +1327,11 @@ struct CsStringParseState
 /**
  * C# strings are complex enough (mostly due to interpolation and nesting) that they need a custom parser.
  */
-static bool parse_cs_string(tok_ctx &ctx, Chunk &pc)
+static bool parse_cs_string(TokenContext &ctx, Chunk &pc)
 {
    cs_string_t stringType = parse_cs_string_start(ctx, pc);
 
-   if (stringType == 0)
+   if (stringType == CS_STRING_NONE)
    {
       return(false);
    }
@@ -1299,11 +1354,11 @@ static bool parse_cs_string(tok_ctx &ctx, Chunk &pc)
          // so we can peek and potentially consume chars for new string openings, before the ch=get() happens later,
          // which is needed for newline processing.
 
-         if (ctx.peek() == '}')
+         if (ctx.peek() == '}')              // 125
          {
             pc.Str().append(ctx.get());
 
-            if (ctx.peek() == '}')
+            if (ctx.peek() == '}')              // 125
             {
                pc.Str().append(ctx.get()); // in interpolated string, `}}` is escape'd `}`
             }
@@ -1315,7 +1370,7 @@ static bool parse_cs_string(tok_ctx &ctx, Chunk &pc)
          }
          stringType = parse_cs_string_start(ctx, pc);
 
-         if (stringType)
+         if (stringType != CS_STRING_NONE)
          {
             parseState.push(CsStringParseState(stringType));
             continue;
@@ -1379,16 +1434,16 @@ static bool parse_cs_string(tok_ctx &ctx, Chunk &pc)
               && !(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() == '"'                  // 34
+            || ctx.peek() == '\\')                // 92
          {
             pc.Str().append(ctx.get());
          }
       }
-      else if (ch == '"')
+      else if (ch == '"')                           // 34
       {
          if (  (parseState.top().type & CS_STRING_VERBATIM)
-            && (ctx.peek() == '"'))
+            && (ctx.peek() == '"'))                           // 34
          {
             // in verbatim string, `""` is escape'd `"`
             pc.Str().append(ctx.get());
@@ -1406,9 +1461,9 @@ static bool parse_cs_string(tok_ctx &ctx, Chunk &pc)
       }
       else if (parseState.top().type & CS_STRING_INTERPOLATED)
       {
-         if (ch == '{')
+         if (ch == '{')                     // 123
          {
-            if (ctx.peek() == '{')
+            if (ctx.peek() == '{')          // 123
             {
                pc.Str().append(ctx.get()); // in interpolated string, `{{` is escape'd `{`
             }
@@ -1423,7 +1478,7 @@ static bool parse_cs_string(tok_ctx &ctx, Chunk &pc)
 } // parse_cs_string
 
 
-static void parse_verbatim_string(tok_ctx &ctx, Chunk &pc)
+static void parse_verbatim_string(TokenContext &ctx, Chunk &pc)
 {
    pc.SetType(CT_STRING);
 
@@ -1438,9 +1493,9 @@ static void parse_verbatim_string(tok_ctx &ctx, Chunk &pc)
       size_t ch = ctx.get();
       pc.Str().append(ch);
 
-      if (  (ch == '"')
-         && (ctx.peek() == '"')
-         && (ctx.peek(1) == '"'))
+      if (  (ch == '"')                      // 34
+         && (ctx.peek() == '"')              // 34
+         && (ctx.peek(1) == '"'))            // 34
       {
          pc.Str().append(ctx.get());
          pc.Str().append(ctx.get());
@@ -1473,7 +1528,7 @@ static bool tag_compare(const deque<int> &d, size_t a_idx, size_t b_idx, size_t
 }
 
 
-static bool parse_cr_string(tok_ctx &ctx, Chunk &pc, size_t q_idx)
+static bool parse_cr_string(TokenContext &ctx, Chunk &pc, size_t q_idx)
 {
    size_t tag_idx = ctx.c.idx + q_idx + 1;
    size_t tag_len = 0;
@@ -1506,8 +1561,8 @@ static bool parse_cr_string(tok_ctx &ctx, Chunk &pc, size_t q_idx)
 
    while (ctx.more())
    {
-      if (  (ctx.peek() == ')')
-         && (ctx.peek(tag_len + 1) == '"')
+      if (  (ctx.peek() == ')')                 // 41
+         && (ctx.peek(tag_len + 1) == '"')      // 34
          && tag_compare(ctx.data, tag_idx, ctx.c.idx + 1, tag_len))
       {
          cnt = tag_len + 2;   // for the )"
@@ -1543,9 +1598,9 @@ static bool parse_cr_string(tok_ctx &ctx, Chunk &pc, size_t q_idx)
  * @param pc   The structure to update, str is an input.
  * @return     Whether a word was parsed (always true)
  */
-static bool parse_word(tok_ctx &ctx, Chunk &pc, bool skipcheck)
+static bool parse_word(TokenContext &ctx, Chunk &pc, bool skipcheck)
 {
-   static unc_text intr_txt("@interface");
+   static UncText intr_txt("@interface");
 
    // The first character is already valid
    pc.Str().clear();
@@ -1559,8 +1614,8 @@ static bool parse_word(tok_ctx &ctx, Chunk &pc, bool skipcheck)
       {
          pc.Str().append(ctx.get());
       }
-      else if (  (ch == '\\')
-              && (unc_tolower(ctx.peek(1)) == 'u'))
+      else if (  (ch == '\\')                            // 92
+              && (unc_tolower(ctx.peek(1)) == 'u'))      // 117
       {
          pc.Str().append(ctx.get());
          pc.Str().append(ctx.get());
@@ -1588,7 +1643,7 @@ static bool parse_word(tok_ctx &ctx, Chunk &pc, bool skipcheck)
    if (  cpd.in_preproc == CT_PP_DEFINE
       && cpd.preproc_ncnl_count == 1)
    {
-      if (ctx.peek() == '(')
+      if (ctx.peek() == '(')               // 40
       {
          pc.SetType(CT_MACRO_FUNC);
       }
@@ -1653,8 +1708,8 @@ static bool parse_word(tok_ctx &ctx, Chunk &pc, bool skipcheck)
                      break;
                   }
 
-                  if (  (ch == '\\')
-                     && !is_cs) // backslashes aren't special in comments in C#
+                  if (  (ch == '\\') // 92
+                     && !is_cs)      // backslashes aren't special in comments in C#
                   {
                      bs_cnt++;
                   }
@@ -1696,7 +1751,7 @@ static bool parse_word(tok_ctx &ctx, Chunk &pc, bool skipcheck)
 } // parse_word
 
 
-static size_t parse_attribute_specifier_sequence(tok_ctx &ctx)
+static size_t parse_attribute_specifier_sequence(TokenContext &ctx)
 {
    size_t nested = 0;
    size_t offset = 0;
@@ -1707,7 +1762,7 @@ static size_t parse_attribute_specifier_sequence(tok_ctx &ctx)
    {
       auto ch2 = ctx.peek(offset++);
 
-      while (  ch2 == ' '
+      while (  ch2 == ' '       // 32
             || ch2 == '\n'
             || ch2 == '\r'
             || ch2 == '\t')
@@ -1716,19 +1771,19 @@ static size_t parse_attribute_specifier_sequence(tok_ctx &ctx)
       }
 
       if (  nested == 0
-         && ch2 != '[')
+         && ch2 != '[')        // 91
       {
          break;
       }
 
-      if (ch1 == '(')
+      if (ch1 == '(')          // 40
       {
          ++parens;
          ch1 = ch2;
          continue;
       }
 
-      if (ch1 == ')')
+      if (ch1 == ')')          // 41
       {
          if (parens == 0)
          {
@@ -1756,7 +1811,7 @@ static size_t parse_attribute_specifier_sequence(tok_ctx &ctx)
          continue;
       }
 
-      if (ch1 == '[')
+      if (ch1 == '[')                    // 91
       {
          if (  nested != 0
             && parens == 0)
@@ -1775,7 +1830,7 @@ static size_t parse_attribute_specifier_sequence(tok_ctx &ctx)
 } // parse_attribute_specifier_sequence
 
 
-static bool extract_attribute_specifier_sequence(tok_ctx &ctx, Chunk &pc, size_t length)
+static bool extract_attribute_specifier_sequence(TokenContext &ctx, Chunk &pc, size_t length)
 {
    pc.Str().clear();
 
@@ -1788,7 +1843,7 @@ static bool extract_attribute_specifier_sequence(tok_ctx &ctx, Chunk &pc, size_t
 } // extract_attribute_specifier_sequence
 
 
-static bool parse_whitespace(tok_ctx &ctx, Chunk &pc)
+static bool parse_whitespace(TokenContext &ctx, Chunk &pc)
 {
    size_t nl_count = 0;
    size_t ch       = 0;
@@ -1850,7 +1905,7 @@ static bool parse_whitespace(tok_ctx &ctx, Chunk &pc)
 } // parse_whitespace
 
 
-static bool parse_bs_newline(tok_ctx &ctx, Chunk &pc)
+static bool parse_bs_newline(TokenContext &ctx, Chunk &pc)
 {
    ctx.save();
    ctx.get(); // skip the '\'
@@ -1880,12 +1935,12 @@ static bool parse_bs_newline(tok_ctx &ctx, Chunk &pc)
 }
 
 
-static bool parse_newline(tok_ctx &ctx)
+static bool parse_newline(TokenContext &ctx)
 {
    ctx.save();
 
    // Eat whitespace
-   while (  (ctx.peek() == ' ')
+   while (  (ctx.peek() == ' ')               // 32
          || (ctx.peek() == '\t'))
    {
       ctx.get();
@@ -1906,7 +1961,7 @@ static bool parse_newline(tok_ctx &ctx)
 }
 
 
-static void parse_pawn_pattern(tok_ctx &ctx, Chunk &pc, E_Token tt)
+static void parse_pawn_pattern(TokenContext &ctx, Chunk &pc, E_Token tt)
 {
    pc.Str().clear();
    pc.SetType(tt);
@@ -1914,7 +1969,7 @@ static void parse_pawn_pattern(tok_ctx &ctx, Chunk &pc, E_Token tt)
    while (!unc_isspace(ctx.peek()))
    {
       // end the pattern on an escaped newline
-      if (ctx.peek() == '\\')
+      if (ctx.peek() == '\\')             // 92
       {
          size_t ch = ctx.peek(1);
 
@@ -1929,7 +1984,7 @@ static void parse_pawn_pattern(tok_ctx &ctx, Chunk &pc, E_Token tt)
 }
 
 
-static bool parse_off_newlines(tok_ctx &ctx, Chunk &pc)
+static bool parse_off_newlines(TokenContext &ctx, Chunk &pc)
 {
    size_t nl_count = 0;
 
@@ -1949,7 +2004,7 @@ static bool parse_off_newlines(tok_ctx &ctx, Chunk &pc)
 }
 
 
-static bool parse_macro(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
+static bool parse_macro(TokenContext &ctx, Chunk &pc, const Chunk *prev_pc)
 {
    if (parse_off_newlines(ctx, pc))
    {
@@ -1963,7 +2018,7 @@ static bool parse_macro(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
    ctx.save();
    pc.Str().clear();
 
-   if (prev_pc == nullptr)
+   if (prev_pc->IsNullChunk())
    {
       return(false);
    }
@@ -1975,7 +2030,7 @@ static bool parse_macro(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
       size_t pk = ctx.peek(), pk1 = ctx.peek(1);
       bool   nl = (  pk == '\n'
                   || pk == '\r');
-      bool   nl_cont = (  pk == '\\'
+      bool   nl_cont = (  pk == '\\'             // 92
                        && (  pk1 == '\n'
                           || pk1 == '\r'));
 
@@ -1999,13 +2054,13 @@ static bool parse_macro(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
 } // parse_macro
 
 
-static bool parse_ignored(tok_ctx &ctx, Chunk &pc)
+static bool parse_ignored(TokenContext &ctx, Chunk &pc)
 {
    if (parse_off_newlines(ctx, pc))
    {
       return(true);
    }
-   // See if the UO_enable_processing_cmt or #pragma endasm / #endasm text is on this line
+   // See if the options::enable_processing_cmt() or #pragma endasm / #endasm text is on this line
    ctx.save();
    pc.Str().clear();
 
@@ -2099,7 +2154,7 @@ static bool parse_ignored(tok_ctx &ctx, Chunk &pc)
 } // parse_ignored
 
 
-static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
+static bool parse_next(TokenContext &ctx, Chunk &pc, const Chunk *prev_pc)
 {
    if (!ctx.more())
    {
@@ -2143,7 +2198,7 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
       && cpd.in_preproc <= CT_PP_OTHER)
    {
       pc.Str().clear();
-      tok_info ss;
+      TokenInfo ss;
       ctx.save(ss);
       // Chunk to a newline or comment
       pc.SetType(CT_PREPROC_BODY);
@@ -2155,8 +2210,8 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
 
          // Fix for issue #1752
          // Ignoring extra spaces after ' \ ' for preproc body continuations
-         if (  last == '\\'
-            && ch == ' ')
+         if (  last == '\\'             // 92
+            && ch == ' ')               // 32
          {
             ctx.get();
             continue;
@@ -2166,7 +2221,7 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
             || (ch == '\r'))
          {
             // Back off if this is an escaped newline
-            if (last == '\\')
+            if (last == '\\')            // 92
             {
                ctx.restore(ss);
                pc.Str().pop_back();
@@ -2175,9 +2230,9 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
          }
 
          // Quit on a C or C++ comment start           Issue #1966
-         if (  (ch == '/')
-            && (  (ctx.peek(1) == '/')
-               || (ctx.peek(1) == '*')))
+         if (  (ch == '/')               // 47
+            && (  (ctx.peek(1) == '/')   // 47
+               || (ctx.peek(1) == '*'))) // 42
          {
             break;
          }
@@ -2194,7 +2249,7 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
    }
 
    // Detect backslash-newline
-   if (  (ctx.peek() == '\\')
+   if (  (ctx.peek() == '\\')                   // 92
       && parse_bs_newline(ctx, pc))
    {
       return(true);
@@ -2224,7 +2279,7 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
    {
       // check for non-keyword identifiers such as @if @switch, etc
       // Vala also allows numeric identifiers if prefixed with '@'
-      if (  ctx.peek() == '@'
+      if (  ctx.peek() == '@'                          // 64
          && (  CharTable::IsKw1(ctx.peek(1))
             || (  language_is_set(LANG_VALA)
                && CharTable::IsKw2(ctx.peek(1)))))
@@ -2236,9 +2291,9 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
 
    // handle VALA """ strings """
    if (  language_is_set(LANG_VALA)
-      && (ctx.peek() == '"')
-      && (ctx.peek(1) == '"')
-      && (ctx.peek(2) == '"'))
+      && (ctx.peek() == '"')                 // 34
+      && (ctx.peek(1) == '"')                // 34
+      && (ctx.peek(2) == '"'))               // 34
    {
       parse_verbatim_string(ctx, pc);
       return(true);
@@ -2250,27 +2305,27 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
    auto ch = ctx.peek();
 
    if (  language_is_set(LANG_C | LANG_CPP)
-      && (  ch == 'u'
-         || ch == 'U'
-         || ch == 'R'
-         || ch == 'L'))
+      && (  ch == 'u'                     // 117
+         || ch == 'U'                     // 85
+         || ch == 'R'                     // 82
+         || ch == 'L'))                   // 76
    {
       auto idx     = size_t{};
       auto is_real = false;
 
-      if (  ch == 'u'
-         && ctx.peek(1) == '8')
+      if (  ch == 'u'                    // 117
+         && ctx.peek(1) == '8')          // 56
       {
          idx = 2;
       }
-      else if (  unc_tolower(ch) == 'u'
-              || ch == 'L')
+      else if (  unc_tolower(ch) == 'u'     // 117
+              || ch == 'L')                 // 76
       {
          idx++;
       }
 
       if (  language_is_set(LANG_C | LANG_CPP)
-         && ctx.peek(idx) == 'R')
+         && ctx.peek(idx) == 'R')             // 82
       {
          idx++;
          is_real = true;
@@ -2279,14 +2334,14 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
 
       if (is_real)
       {
-         if (  quote == '"'
+         if (  quote == '"'                  // 34
             && parse_cr_string(ctx, pc, idx))
          {
             return(true);
          }
       }
-      else if (  (  quote == '"'
-                 || quote == '\'')
+      else if (  (  quote == '"'                  // 34
+                 || quote == '\'')                // 39
               && parse_string(ctx, pc, idx, true))
       {
          return(true);
@@ -2305,18 +2360,18 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
       }
 
       // Check for PAWN strings: \"hi" or !"hi" or !\"hi" or \!"hi"
-      if (  (ctx.peek() == '\\')
-         || (ctx.peek() == '!'))
+      if (  (ctx.peek() == '\\')      // 92
+         || (ctx.peek() == '!'))      // 33
       {
-         if (ctx.peek(1) == '"')
+         if (ctx.peek(1) == '"')      // 32
          {
-            parse_string(ctx, pc, 1, (ctx.peek() == '!'));
+            parse_string(ctx, pc, 1, (ctx.peek() == '!'));  // 33
             return(true);
          }
 
-         if (  (  (ctx.peek(1) == '\\')
-               || (ctx.peek(1) == '!'))
-            && (ctx.peek(2) == '"'))
+         if (  (  (ctx.peek(1) == '\\')           // 92
+               || (ctx.peek(1) == '!'))           // 33
+            && (ctx.peek(2) == '"'))              // 32
          {
             parse_string(ctx, pc, 2, false);
             return(true);
@@ -2325,7 +2380,7 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
 
       // handle PAWN preprocessor args %0 .. %9
       if (  cpd.in_preproc == CT_PP_DEFINE
-         && (ctx.peek() == '%')
+         && (ctx.peek() == '%')               // 37
          && unc_isdigit(ctx.peek(1)))
       {
          pc.Str().clear();
@@ -2337,8 +2392,6 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
    }
    // Parse strings and character constants
 
-//parse_word(ctx, pc_temp, true);
-//ctx.restore(ctx.c);
    if (parse_number(ctx, pc))
    {
       return(true);
@@ -2360,13 +2413,13 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
       ch = ctx.peek();
       size_t ch1 = ctx.peek(1);
 
-      if (  (  (  (ch == 'L')
-               || (ch == 'S'))
-            && (  (ch1 == '"')
-               || (ch1 == '\'')))
-         || (ch == '"')
-         || (ch == '\'')
-         || (  (ch == '<')
+      if (  (  (  (ch == 'L')            // 76
+               || (ch == 'S'))           // 83
+            && (  (ch1 == '"')           // 34
+               || (ch1 == '\'')))        // 39
+         || (ch == '"')                  // 34
+         || (ch == '\'')                 // 39
+         || (  (ch == '<')               // 60
             && cpd.in_preproc == CT_PP_INCLUDE))
       {
          parse_string(ctx, pc, unc_isalpha(ch) ? 1 : 0, true);
@@ -2378,7 +2431,7 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
          return(true);
       }
 
-      if (  (ch == '<')
+      if (  (ch == '<')                    // 60
          && cpd.in_preproc == CT_PP_DEFINE)
       {
          if (Chunk::GetTail()->Is(CT_MACRO))
@@ -2391,7 +2444,7 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
       /* Inside clang's __has_include() could be "path/to/file.h" or system-style <path/to/file.h> */
       Chunk *tail = Chunk::GetTail();
 
-      if (  (ch == '(')
+      if (  (ch == '(')                 // 40
          && (tail->IsNotNullChunk())
          && (  tail->Is(CT_CNG_HASINC)
             || tail->Is(CT_CNG_HASINCN)))
@@ -2403,11 +2456,11 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
 
    // Check for Vala string templates
    if (  language_is_set(LANG_VALA)
-      && (ctx.peek() == '@'))
+      && (ctx.peek() == '@'))            // 64
    {
       size_t nc = ctx.peek(1);
 
-      if (nc == '"')
+      if (nc == '"')                     // 34
       {
          // literal string
          parse_string(ctx, pc, 1, true);
@@ -2417,13 +2470,13 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
 
    // Check for Objective C literals
    if (  language_is_set(LANG_OC)
-      && (ctx.peek() == '@'))
+      && (ctx.peek() == '@'))            // 64
    {
       size_t nc = ctx.peek(1);
 
-      if (nc == 'R') // Issue #2720
+      if (nc == 'R') // Issue #2720  82
       {
-         if (ctx.peek(2) == '"')
+         if (ctx.peek(2) == '"')          // 34
          {
             if (parse_cr_string(ctx, pc, 2)) // Issue #3027
             {
@@ -2435,8 +2488,8 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
          }
       }
 
-      if (  (nc == '"')
-         || (nc == '\''))
+      if (  (nc == '"')          // 34
+         || (nc == '\''))        // 39
       {
          // literal string
          parse_string(ctx, pc, 1, true);
@@ -2455,9 +2508,9 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *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() == '@')
+      || (  (ctx.peek() == '\\')                    // 92
+         && (unc_tolower(ctx.peek(1)) == 'u'))      // 117
+      || (  (ctx.peek() == '@')                     // 64
          && CharTable::IsKw1(ctx.peek(1))))
    {
       parse_word(ctx, pc, false);
@@ -2466,10 +2519,10 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
 
    // Check for C++11/14/17/20 attribute specifier sequences
    if (  language_is_set(LANG_CPP)
-      && ctx.peek() == '[')
+      && ctx.peek() == '[')                   // 91
    {
       if (  !language_is_set(LANG_OC)
-         || (  prev_pc != nullptr
+         || (  prev_pc->IsNotNullChunk()
             && !prev_pc->Is(CT_OC_AT)))
       {
          if (auto length = parse_attribute_specifier_sequence(ctx))
@@ -2540,8 +2593,8 @@ static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
 } // parse_next
 
 
-int find_disable_processing_comment_marker(const unc_text &text,
-                                           std::size_t    start_idx)
+int find_disable_processing_comment_marker(const UncText &text,
+                                           std::size_t   start_idx)
 {
    log_rule_B("disable_processing_cmt");
    const auto &offtext = options::disable_processing_cmt();
@@ -2593,8 +2646,8 @@ int find_disable_processing_comment_marker(const unc_text &text,
 } // find_disable_processing_comment_marker
 
 
-int find_enable_processing_comment_marker(const unc_text &text,
-                                          std::size_t    start_idx)
+int find_enable_processing_comment_marker(const UncText &text,
+                                          std::size_t   start_idx)
 {
    log_rule_B("enable_processing_cmt");
    const auto &ontext = options::enable_processing_cmt();
@@ -2651,13 +2704,13 @@ int find_enable_processing_comment_marker(const unc_text &text,
 
 void tokenize(const deque<int> &data, Chunk *ref)
 {
-   tok_ctx ctx(data);
-   Chunk   chunk;
-   Chunk   *pc          = nullptr;
-   Chunk   *rprev       = nullptr;
-   bool    last_was_tab = false;
-   size_t  prev_sp      = 0;
-   int     num_stripped = 0;                    // Issue #1966
+   TokenContext ctx(data);
+   Chunk        chunk;
+   Chunk        *pc          = Chunk::NullChunkPtr;
+   Chunk        *rprev       = Chunk::NullChunkPtr;
+   bool         last_was_tab = false;
+   size_t       prev_sp      = 0;
+   int          num_stripped = 0;               // Issue #1966
 
    cpd.unc_stage = unc_stage_e::TOKENIZE;
 
@@ -2714,7 +2767,7 @@ void tokenize(const deque<int> &data, Chunk *ref)
          // Issue #1338
          // Strip trailing whitespace (for CPP comments and PP blocks)
          while (  (chunk.GetStr().size() > 0)
-               && (  (chunk.GetStr()[chunk.GetStr().size() - 1] == ' ')
+               && (  (chunk.GetStr()[chunk.GetStr().size() - 1] == ' ')         // 32
                   || (chunk.GetStr()[chunk.GetStr().size() - 1] == '\t')))
          {
             // If comment contains backslash '\' followed by whitespace chars, keep last one;
@@ -2737,7 +2790,7 @@ void tokenize(const deque<int> &data, Chunk *ref)
       // Add the chunk to the list
       rprev = pc;
 
-      if (rprev != nullptr)
+      if (rprev->IsNotNullChunk())
       {
          pc->SetFlagBits(rprev->GetFlags() & PCF_COPY_FLAGS);
 
@@ -2748,7 +2801,7 @@ void tokenize(const deque<int> &data, Chunk *ref)
          }
       }
 
-      if (ref != nullptr)
+      if (ref->IsNotNullChunk())
       {
          chunk.SetFlagBits(PCF_INSERTED);
       }
@@ -2776,6 +2829,18 @@ void tokenize(const deque<int> &data, Chunk *ref)
       if (cpd.in_preproc != CT_NONE)
       {
          pc->SetFlagBits(PCF_IN_PREPROC);
+         // Issue #2225
+         LOG_FMT(LBCTRL, "%s(%d): orig line is %zu, orig col is %zu, type is %s, parentType is %s\n",
+                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(),
+                 get_token_name(pc->GetType()), get_token_name(pc->GetParentType()));
+
+         if (  pc->Is(CT_STRING_MULTI)
+            && pc->GetParentType() == CT_PP_INCLUDE)
+         {
+            LOG_FMT(LWARN, "%s:%zu: File name is not possible %s\n",
+                    cpd.filename.c_str(), pc->GetOrigLine(), pc->Text());
+            exit(EX_SOFTWARE);
+         }
 
          // Count words after the preprocessor
          if (!pc->IsCommentOrNewline())
@@ -2825,7 +2890,7 @@ void tokenize(const deque<int> &data, Chunk *ref)
       {
          // Check for a preprocessor start
          if (  pc->Is(CT_POUND)
-            && (  rprev == nullptr
+            && (  rprev->IsNullChunk()
                || rprev->Is(CT_NEWLINE)))
          {
             pc->SetType(CT_PREPROC);
@@ -2836,18 +2901,18 @@ void tokenize(const deque<int> &data, Chunk *ref)
 
       if (pc->Is(CT_NEWLINE))
       {
-         LOG_FMT(LGUY, "%s(%d): orig line is %zu, orig col is %zu, <Newline>, nl is %zu\n",
+         LOG_FMT(LBCTRL, "%s(%d): orig line is %zu, orig col is %zu, <Newline>, nl is %zu\n",
                  __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->GetNlCount());
       }
       else if (pc->Is(CT_VBRACE_OPEN))
       {
-         LOG_FMT(LGUY, "%s(%d): orig line is %zu, orig col is %zu, type is %s, orig col end is %zu\n",
+         LOG_FMT(LBCTRL, "%s(%d): orig line is %zu, orig col is %zu, type is %s, orig col end is %zu\n",
                  __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()), pc->GetOrigColEnd());
       }
       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",
+         LOG_FMT(LBCTRL, "%s(%d): orig line is %zu, orig col is %zu, Text() '%s', type is %s, orig col end is %zu\n",
                  __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->ElidedText(copy), get_token_name(pc->GetType()), pc->GetOrigColEnd());
       }
    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/tokenize.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/tokenize.h
index a111143b..6f1df591 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/tokenize.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/tokenize.h
@@ -1,6 +1,6 @@
 /**
  * @file tokenize.h
- * prototypes for tokenize.c
+ * prototypes for tokenize.cpp
  *
  * @author  Ben Gardner
  * @license GPL v2+
@@ -21,7 +21,7 @@
  * @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);
+int find_disable_processing_comment_marker(const UncText &text, std::size_t start_idx = 0);
 
 
 /**
@@ -33,7 +33,7 @@ int find_disable_processing_comment_marker(const unc_text &text, std::size_t sta
  * @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);
+int find_enable_processing_comment_marker(const UncText &text, std::size_t start_idx = 0);
 
 
 /**
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/tokenize_cleanup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/tokenize_cleanup.cpp
index 4a8e6773..831e1aae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/tokenize_cleanup.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/tokenize_cleanup.cpp
@@ -6,12 +6,13 @@
  *  - detect "version = 10;" vs "version (xxx) {"
  *
  * @author  Ben Gardner
- * @author  Guy Maurel 2015, 2021
+ * @author  Guy Maurel 2015, 2022
  * @license GPL v2+
  */
 
 #include "tokenize_cleanup.h"
 
+#include "check_template.h"
 #include "combine.h"
 #include "combine_skip.h"
 #include "flag_braced_init_list.h"
@@ -27,42 +28,6 @@ using namespace uncrustify;
 
 
 /**
- * Mark types in a single template argument.
- *
- * @param start  chunk to start check at
- * @param end    chunk to end check at
- */
-static void check_template_arg(Chunk *start, Chunk *end);
-
-
-/**
- * Mark types in template argument(s).
- *
- * @param start  chunk to start check at
- * @param end    chunk to end check at
- */
-static void check_template_args(Chunk *start, Chunk *end);
-
-
-/**
- * If there is nothing but CT_WORD and CT_MEMBER, then it's probably a
- * template thingy.  Otherwise, it's likely a comparison.
- *
- * @param start  chunk to start check at
- */
-static void check_template(Chunk *start, bool in_type_cast);
-
-
-/**
- * Convert '>' + '>' into '>>'
- * If we only have a single '>', then change it to CT_COMPARE.
- *
- * @param pc  chunk to start at
- */
-static Chunk *handle_double_angle_close(Chunk *pc);
-
-
-/**
  * Marks ObjC specific chunks in property declaration, by setting
  * parent types and chunk types.
  */
@@ -83,40 +48,6 @@ static void mark_selectors_in_property_with_open_paren(Chunk *open_paren);
 static void mark_attributes_in_property_with_open_paren(Chunk *open_paren);
 
 
-static Chunk *handle_double_angle_close(Chunk *pc)
-{
-   if (pc == nullptr)
-   {
-      pc = Chunk::NullChunkPtr;
-   }
-   Chunk *next = pc->GetNext();
-
-   if (next->IsNotNullChunk())
-   {
-      if (  pc->Is(CT_ANGLE_CLOSE)
-         && next->Is(CT_ANGLE_CLOSE)
-         && pc->GetParentType() == CT_NONE
-         && (pc->GetOrigColEnd() + 1) == next->GetOrigCol()
-         && next->GetParentType() == CT_NONE)
-      {
-         pc->Str().append('>');
-         pc->SetType(CT_SHIFT);
-         pc->SetOrigColEnd(next->GetOrigColEnd());
-
-         Chunk *tmp = next->GetNextNcNnl();
-         Chunk::Delete(next);
-         next = tmp;
-      }
-      else
-      {
-         // bug #663
-         pc->SetType(CT_COMPARE);
-      }
-   }
-   return(next);
-}
-
-
 void split_off_angle_close(Chunk *pc)
 {
    const chunk_tag_t *ct = find_punctuator(pc->Text() + 1, cpd.lang_flags);
@@ -797,6 +728,7 @@ void tokenize_cleanup()
             if ((tmp = next->GetNextNcNnl())->IsNotNullChunk())
             {
                tmp->SetFlagBits(PCF_STMT_START | PCF_EXPR_START);
+               log_ruleStart("start statementi/ expression", tmp);
             }
          }
          else
@@ -988,6 +920,7 @@ void tokenize_cleanup()
          if (tmp->IsNotNullChunk())
          {
             tmp->SetFlagBits(PCF_STMT_START | PCF_EXPR_START);
+            log_ruleStart("start statementi/ expression", tmp);
          }
          tmp = pc->GetNextType(CT_OC_END, pc->GetLevel());
 
@@ -1063,6 +996,7 @@ void tokenize_cleanup()
          if (next->IsNot(CT_PAREN_OPEN))
          {
             next->SetFlagBits(PCF_STMT_START | PCF_EXPR_START);
+            log_ruleStart("start statement/ expression", next);
          }
          else
          {
@@ -1195,494 +1129,6 @@ void tokenize_cleanup()
 } // tokenize_cleanup
 
 
-bool invalid_open_angle_template(Chunk *prev)
-{
-   if (prev == nullptr)
-   {
-      return(false);
-   }
-   // A template requires a word/type right before the open angle
-   return(  prev->IsNot(CT_WORD)
-         && prev->IsNot(CT_TYPE)
-         && prev->IsNot(CT_COMMA)
-         && prev->IsNot(CT_QUALIFIER)
-         && prev->IsNot(CT_OPERATOR_VAL)
-         && prev->GetParentType() != CT_OPERATOR);
-}
-
-
-static void check_template(Chunk *start, bool in_type_cast)
-{
-   LOG_FMT(LTEMPL, "%s(%d): orig line %zu, orig col %zu:\n",
-           __func__, __LINE__, start->GetOrigLine(), start->GetOrigCol());
-
-   Chunk *prev = start->GetPrevNcNnl(E_Scope::PREPROC);
-
-   if (prev->IsNullChunk())
-   {
-      return;
-   }
-   Chunk *end;
-   Chunk *pc;
-
-   if (prev->Is(CT_TEMPLATE))
-   {
-      LOG_FMT(LTEMPL, "%s(%d): CT_TEMPLATE:\n", __func__, __LINE__);
-
-      // We have: "template< ... >", which is a template declaration
-      size_t level  = 1;
-      size_t parens = 0;
-
-      for (pc = start->GetNextNcNnl(E_Scope::PREPROC);
-           pc->IsNotNullChunk();
-           pc = pc->GetNextNcNnl(E_Scope::PREPROC))
-      {
-         LOG_FMT(LTEMPL, "%s(%d): type is %s, level is %zu\n",
-                 __func__, __LINE__, get_token_name(pc->GetType()), level);
-
-         if (  (pc->GetStr()[0] == '>')
-            && (pc->Len() > 1))
-         {
-            if (pc->GetStr()[1] == '=')                         // Issue #1462 and #2565
-            {
-               LOG_FMT(LTEMPL, "%s(%d): do not split '%s' at orig line %zu, orig col %zu\n",
-                       __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
-            }
-            else
-            {
-               LOG_FMT(LTEMPL, "%s(%d): {split '%s' at orig line %zu, orig col %zu}\n",
-                       __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
-               split_off_angle_close(pc);
-            }
-         }
-
-         if (pc->Is(CT_DECLTYPE))
-         {
-            flag_cpp_decltype(pc);
-         }
-         else if (pc->Is(CT_PAREN_OPEN))
-         {
-            ++parens;
-         }
-         else if (pc->Is(CT_PAREN_CLOSE))
-         {
-            --parens;
-         }
-
-         if (parens == 0)
-         {
-            if (pc->IsString("<"))
-            {
-               level++;
-            }
-            else if (pc->IsString(">"))
-            {
-               if (level == 0)
-               {
-                  fprintf(stderr, "%s(%d): level is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                          __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
-                  log_flush(true);
-                  exit(EX_SOFTWARE);
-               }
-               level--;
-
-               if (level == 0)
-               {
-                  break;
-               }
-            }
-         }
-      }
-
-      end = pc;
-   }
-   else
-   {
-      /*
-       * We may have something like "a< ... >", which is a template where
-       * '...' may consist of anything except a semicolon, unbalanced
-       * parens, or braces (with one exception being braced initializers
-       * embedded within decltypes).
-       *
-       * For example, braces may be encountered as such in the following
-       * snippet of valid C++ code:
-       *
-       * template<typename T,
-       *          typename = enable_if_t<is_same<typename decay<T>::type,
-       *                                          decltype (make_index_sequence<5> { })>::value>>
-       * void foo(T &&arg)
-       * {
-       *
-       * }
-       *
-       * Finally, if we are inside an 'if' statement and hit a CT_BOOL,
-       * then it isn't a template.
-       */
-
-      if (invalid_open_angle_template(prev))
-      {
-         LOG_FMT(LTEMPL, "%s(%d): - after type %s + ( - Not a template\n",
-                 __func__, __LINE__, get_token_name(prev->GetType()));
-         start->SetType(CT_COMPARE);
-         return;
-      }
-      LOG_FMT(LTEMPL, "%s(%d): - prev->GetType() is %s -\n",
-              __func__, __LINE__, get_token_name(prev->GetType()));
-
-      // Scan back and make sure we aren't inside square parenthesis
-      bool in_if         = false;
-      bool hit_semicolon = false;
-      pc = start->GetPrevNcNnl(E_Scope::PREPROC);
-
-      while (pc->IsNotNullChunk())
-      {
-         if (  (  pc->Is(CT_SEMICOLON)
-               && hit_semicolon)
-            || pc->Is(CT_SQUARE_CLOSE))
-         {
-            break;
-         }
-
-         if (pc->Is(CT_DECLTYPE))
-         {
-            flag_cpp_decltype(pc);
-         }
-
-         if (pc->Is(CT_BRACE_OPEN))
-         {
-            if (  !pc->TestFlags(PCF_IN_DECLTYPE)
-               || !detect_cpp_braced_init_list(pc->GetPrev(), pc))
-            {
-               break;
-            }
-            flag_cpp_braced_init_list(pc->GetPrev(), pc);
-         }
-
-         if (  pc->Is(CT_BRACE_CLOSE)
-            && pc->GetParentType() != CT_BRACED_INIT_LIST
-            && !pc->TestFlags(PCF_IN_DECLTYPE))
-         {
-            break;
-         }
-
-         if (  pc->Is(CT_SEMICOLON)
-            && !hit_semicolon)
-         {
-            hit_semicolon = true;
-         }
-
-         if (  (  (  pc->Is(CT_IF)
-                  || pc->Is(CT_RETURN)
-                  || pc->Is(CT_WHILE)
-                  || pc->Is(CT_WHILE_OF_DO))
-               && !hit_semicolon)
-            || (  pc->Is(CT_FOR)
-               && hit_semicolon))
-         {
-            in_if = true;
-            break;
-         }
-         pc = pc->GetPrevNcNnl(E_Scope::PREPROC);
-      }
-      /*
-       * Scan forward to the angle close
-       * If we have a comparison in there, then it can't be a template.
-       */
-      const int max_token_count = 1024;
-      E_Token   tokens[max_token_count];
-      size_t    num_tokens = 1;
-
-      tokens[0] = CT_ANGLE_OPEN;
-
-      for (pc = start->GetNextNcNnl(E_Scope::PREPROC);
-           pc->IsNotNullChunk();
-           pc = pc->GetNextNcNnl(E_Scope::PREPROC))
-      {
-         constexpr static auto LCURRENT = LTEMPL;
-
-         LOG_FMT(LTEMPL, "%s(%d): pc orig line is %zu, orig col is %zu, type is %s, num_tokens is %zu\n",
-                 __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetType()), num_tokens);
-
-         log_rule_B("tok_split_gte");
-
-         if (pc->Is(CT_BRACE_OPEN))                     // Issue #2886
-         {
-            // look for the closing brace
-            Chunk *A = pc->GetClosingParen();
-            LOG_FMT(LTEMPL, "%s(%d): A orig line is %zu, orig col is %zu, type is %s\n",
-                    __func__, __LINE__, A->GetOrigLine(), A->GetOrigCol(), get_token_name(A->GetType()));
-            pc = A->GetNext();
-         }
-
-         if (  (tokens[num_tokens - 1] == CT_ANGLE_OPEN)
-            && (pc->GetStr()[0] == '>')
-            && (pc->Len() > 1)
-            && (  options::tok_split_gte()
-               || (  (  pc->IsString(">>")
-                     || pc->IsString(">>>"))
-                  && (  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->GetOrigLine(), pc->GetOrigCol());
-
-            split_off_angle_close(pc);
-         }
-
-         if (pc->IsString("<"))
-         {
-            if (  num_tokens > 0 && (tokens[num_tokens - 1] == CT_PAREN_OPEN)
-               && invalid_open_angle_template(pc->GetPrev()))
-            {
-               pc->SetType(CT_COMPARE); // Issue #3127
-            }
-            else
-            {
-               tokens[num_tokens] = CT_ANGLE_OPEN;
-               num_tokens++;
-            }
-         }
-         else if (pc->IsString(">"))
-         {
-            if (num_tokens > 0 && (tokens[num_tokens - 1] == CT_PAREN_OPEN))
-            {
-               handle_double_angle_close(pc);
-            }
-            else if (--num_tokens <= 0)
-            {
-               break;
-            }
-            else if (tokens[num_tokens] != CT_ANGLE_OPEN)
-            {
-               break; // unbalanced parentheses
-            }
-         }
-         else if (  in_if
-                 && (  pc->Is(CT_BOOL)
-                    || pc->Is(CT_COMPARE)))
-         {
-            break;
-         }
-         else if (pc->Is(CT_BRACE_OPEN))
-         {
-            if (  !pc->TestFlags(PCF_IN_DECLTYPE)
-               || !detect_cpp_braced_init_list(pc->GetPrev(), pc))
-            {
-               break;
-            }
-            auto brace_open  = pc->GetNextNcNnl();
-            auto brace_close = brace_open->GetClosingParen();
-
-            brace_open->SetParentType(CT_BRACED_INIT_LIST);
-            brace_close->SetParentType(CT_BRACED_INIT_LIST);
-         }
-         else if (  pc->Is(CT_BRACE_CLOSE)
-                 && pc->GetParentType() != CT_BRACED_INIT_LIST
-                 && !pc->TestFlags(PCF_IN_DECLTYPE))
-         {
-            break;
-         }
-         else if (pc->Is(CT_SEMICOLON))
-         {
-            break;
-         }
-         else if (pc->Is(CT_PAREN_OPEN))
-         {
-            if (num_tokens >= max_token_count - 1)
-            {
-               break;
-            }
-            tokens[num_tokens] = CT_PAREN_OPEN;
-            num_tokens++;
-         }
-         else if (  pc->Is(CT_QUESTION)                    // Issue #2949
-                 && language_is_set(LANG_CPP))
-         {
-            break;
-         }
-         else if (pc->Is(CT_PAREN_CLOSE))
-         {
-            if (num_tokens == 0)
-            {
-               fprintf(stderr, "%s(%d): num_tokens is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                       __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
-               log_flush(true);
-               exit(EX_SOFTWARE);
-            }
-            num_tokens--;
-
-            if (tokens[num_tokens] != CT_PAREN_OPEN)
-            {
-               break;  // unbalanced parentheses
-            }
-         }
-      }
-
-      end = pc;
-   }
-
-   if (end->Is(CT_ANGLE_CLOSE))
-   {
-      pc = end->GetNextNcNnl(E_Scope::PREPROC);
-
-      if (  pc->IsNullChunk()
-         || pc->IsNot(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",
-                 __func__, __LINE__, start->GetOrigLine(), start->GetOrigCol());
-         LOG_FMT(LTEMPL, "%s(%d):     to   orig line %zu, orig col %zu\n",
-                 __func__, __LINE__, end->GetOrigLine(), end->GetOrigCol());
-         start->SetParentType(CT_TEMPLATE);
-
-         check_template_args(start, end);
-
-         end->SetParentType(CT_TEMPLATE);
-         end->SetFlagBits(PCF_IN_TEMPLATE);
-         return;
-      }
-   }
-   LOG_FMT(LTEMPL, "%s(%d): - Not a template: end = %s\n",
-           __func__, __LINE__, (end != nullptr) ? get_token_name(end->GetType()) : "<null>");
-   start->SetType(CT_COMPARE);
-} // check_template
-
-
-static void check_template_arg(Chunk *start, Chunk *end)
-{
-   LOG_FMT(LTEMPL, "%s(%d): Template argument detected\n", __func__, __LINE__);
-   LOG_FMT(LTEMPL, "%s(%d):     from orig line %zu, orig col %zu\n",
-           __func__, __LINE__, start->GetOrigLine(), start->GetOrigCol());
-   LOG_FMT(LTEMPL, "%s(%d):     to   orig line %zu, orig col %zu\n",
-           __func__, __LINE__, end->GetOrigLine(), end->GetOrigCol());
-
-   // Issue #1127
-   // MyFoo<mySize * 2> foo1;
-   // MyFoo<2*mySize * 2> foo1;
-   // Issue #1346
-   // use it as ONE line:
-   //   typename std::enable_if<!std::is_void<T>::value,
-   //   QVector<T> >::type dummy(const std::function<T*(const S&)>&
-   //   pFunc, const QVector<S>& pItems)
-   // we need two runs
-   // 1. run to test if expression is numeric
-   bool  expressionIsNumeric = false;
-   Chunk *pc                 = start;
-
-   while (pc != end)
-   {
-      Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
-      // a test "if (next == nullptr)" is not necessary
-      pc->SetFlagBits(PCF_IN_TEMPLATE);
-
-      if (  pc->Is(CT_DECLTYPE)
-         || pc->Is(CT_SIZEOF))
-      {
-         expressionIsNumeric = true;
-         break;
-      }
-
-      if (next->IsNot(CT_PAREN_OPEN))
-      {
-         if (  pc->Is(CT_NUMBER)
-            || pc->Is(CT_ARITH)
-            || pc->Is(CT_SHIFT))
-         {
-            expressionIsNumeric = true;
-            break;
-         }
-      }
-      pc = next;
-   }
-   LOG_FMT(LTEMPL, "%s(%d): expressionIsNumeric is %s\n",
-           __func__, __LINE__, expressionIsNumeric ? "TRUE" : "FALSE");
-
-   // 2. run to do the work
-   if (!expressionIsNumeric)
-   {
-      pc = start;
-
-      while (pc != end)
-      {
-         Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
-         // a test "if (next == nullptr)" is not necessary
-         pc->SetFlagBits(PCF_IN_TEMPLATE);
-
-         Chunk *prev  = pc->GetPrevNcNnl(E_Scope::PREPROC);
-         Chunk *prev2 = prev->GetPrevNcNnl(E_Scope::PREPROC);
-
-         if (  prev->Is(CT_ELLIPSIS)                 // Issue #3309
-            && prev2->Is(CT_TYPENAME))
-         {
-            pc->SetType(CT_PARAMETER_PACK);
-         }
-         else
-         {
-            make_type(pc);
-         }
-         pc = next;
-      }
-   }
-} // check_template_arg
-
-
-static void check_template_args(Chunk *start, Chunk *end)
-{
-   std::vector<E_Token> tokens;
-
-   // Scan for commas
-   Chunk *pc;
-
-   for (pc = start->GetNextNcNnl(E_Scope::PREPROC);
-        pc->IsNotNullChunk() && pc != end;
-        pc = pc->GetNextNcNnl(E_Scope::PREPROC))
-   {
-      switch (pc->GetType())
-      {
-      case CT_COMMA:
-
-         if (tokens.empty())
-         {
-            // Check current argument
-            check_template_args(start, pc);
-            start = pc;
-         }
-         break;
-
-      case CT_ANGLE_OPEN:
-      case CT_PAREN_OPEN:
-         tokens.push_back(pc->GetType());
-         break;
-
-      case CT_ANGLE_CLOSE:
-
-         if (  !tokens.empty()
-            && tokens.back() == CT_ANGLE_OPEN)
-         {
-            tokens.pop_back();
-         }
-         break;
-
-      case CT_PAREN_CLOSE:
-
-         if (  !tokens.empty()
-            && tokens.back() == CT_PAREN_OPEN)
-         {
-            tokens.pop_back();
-         }
-         break;
-
-      default:
-         break;
-      }
-   }
-
-   // Check whatever is left
-   check_template_arg(start, end);
-} // check_template_args
-
-
 static void cleanup_objc_property(Chunk *start)
 {
    assert(start->Is(CT_OC_PROPERTY));
@@ -1706,6 +1152,7 @@ static void cleanup_objc_property(Chunk *start)
       if (tmp->IsNotNullChunk())
       {
          tmp->SetFlagBits(PCF_STMT_START | PCF_EXPR_START);
+         log_ruleStart("start statement/ expression", tmp);
 
          tmp = tmp->GetNextType(CT_SEMICOLON, start->GetLevel());
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/tokenize_cleanup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/tokenize_cleanup.h
index 1789ee26..b6dde163 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/tokenize_cleanup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/tokenize_cleanup.h
@@ -1,6 +1,6 @@
 /**
  * @file tokenize_cleanup.h
- * prototypes for tokenize_cleanup.c
+ * prototypes for tokenize_cleanup.cpp
  *
  * @author  Ben Gardner
  * @license GPL v2+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_ctype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/unc_ctype.cpp
index 352b4efb..352b4efb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_ctype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/unc_ctype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_ctype.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/unc_ctype.h
index 8cfcbf3b..8cfcbf3b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_ctype.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/unc_ctype.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_text.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/unc_text.cpp
index 1f96a67c..6b4eb7fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_text.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/unc_text.cpp
@@ -1,5 +1,5 @@
 /**
- * @file unc_text.cpp
+ * @file UncText.cpp
  * A simple class that handles the chunk text.
  *
  * @author  Ben Gardner
@@ -12,6 +12,7 @@
 #include "unicode.h" // encode_utf8()
 
 #include <algorithm>
+#include <cstdint>
 #include <stdexcept>
 
 
@@ -24,21 +25,21 @@ static constexpr const int_fast8_t UTF8_BLOCKS = 6;  // 6 -> max utf8 blocks per
 static size_t fix_len_idx(size_t size, size_t idx, size_t len);
 
 //! converts \n and \r chars are into NL and CR UTF8 symbols before encode_utf8 is called
-static void toLogTextUtf8(int c, unc_text::log_type &container);
+static void toLogTextUtf8(int c, UncText::log_type &container);
 
 /**
  * calculates the size a 'log_type' container needs to have in order to take
- * in values of a 'unc_text::value_type' up to idx
+ * in values of a 'UncText::value_type' up to idx
  * (without \0, with symbols for the converted \n and \r chars)
  *
  * throws if char is greater than 0x7fffffff
  */
-static int getLogTextUtf8Len(unc_text::value_type &c0, size_t end);
+static int getLogTextUtf8Len(UncText::value_type &c0, size_t end);
 
-static int getLogTextUtf8Len(unc_text::value_type &c0, size_t start, size_t end);
+static int getLogTextUtf8Len(UncText::value_type &c0, size_t start, size_t end);
 
 
-static int getLogTextUtf8Len(unc_text::value_type &c0, size_t start, size_t end)
+static int getLogTextUtf8Len(UncText::value_type &c0, size_t start, size_t end)
 {
    size_t c1_idx = 0;
 
@@ -90,13 +91,13 @@ static int getLogTextUtf8Len(unc_text::value_type &c0, size_t start, size_t end)
 } // getLogTextUTF8Len
 
 
-static int getLogTextUtf8Len(unc_text::value_type &c0, size_t end)
+static int getLogTextUtf8Len(UncText::value_type &c0, size_t end)
 {
    return(getLogTextUtf8Len(c0, 0, end));
 }
 
 
-static void toLogTextUtf8(int c, unc_text::log_type &container)
+static void toLogTextUtf8(int c, UncText::log_type &container)
 {
    if (c == '\n')
    {
@@ -122,135 +123,141 @@ static size_t fix_len_idx(size_t size, size_t idx, size_t len)
 }
 
 
-unc_text::unc_text()
+UncText::UncText()
 {
    m_logtext = log_type{ '\0' };
 }
 
 
-unc_text::unc_text(const unc_text &ref)
+UncText::UncText(const UncText &ref)
 {
    set(ref);
 }
 
 
-unc_text::unc_text(const unc_text &ref, size_t idx, size_t len)
+UncText::UncText(const UncText &ref, size_t idx, size_t len)
 {
    set(ref, idx, len);
 }
 
 
-unc_text::unc_text(const char *ascii_text)
+UncText::UncText(const char *ascii_text)
 {
    set(ascii_text);
 }
 
 
-unc_text::unc_text(const std::string &ascii_text)
+UncText::UncText(const std::string &ascii_text)
 {
    set(ascii_text);
 }
 
 
-unc_text::unc_text(const value_type &data, size_t idx, size_t len)
+UncText::UncText(const value_type &data, size_t idx, size_t len)
 {
    set(data, idx, len);
 }
 
 
-size_t unc_text::size() const
+size_t UncText::size() const
 {
    return(m_chars.size());
 }
 
 
-unc_text &unc_text::operator=(int ch)
+UncText &UncText::operator=(int ch)
 {
    set(ch);
    return(*this);
 }
 
 
-unc_text &unc_text::operator=(const unc_text &ref)
+UncText &UncText::operator=(const UncText &ref)
 {
    set(ref);
    return(*this);
 }
 
 
-unc_text &unc_text::operator=(const std::string &ascii_text)
+UncText &UncText::operator=(const std::string &ascii_text)
 {
    set(ascii_text);
    return(*this);
 }
 
 
-unc_text &unc_text::operator=(const char *ascii_text)
+UncText &UncText::operator=(const char *ascii_text)
 {
    set(ascii_text);
    return(*this);
 }
 
 
-unc_text &unc_text::operator+=(int ch)
+UncText &UncText::operator+=(int ch)
 {
    append(ch);
    return(*this);
 }
 
 
-unc_text &unc_text::operator+=(const unc_text &ref)
+UncText &UncText::operator+=(const UncText &ref)
 {
    append(ref);
    return(*this);
 }
 
 
-unc_text &unc_text::operator+=(const std::string &ascii_text)
+UncText &UncText::operator+=(const std::string &ascii_text)
 {
    append(ascii_text);
    return(*this);
 }
 
 
-unc_text &unc_text::operator+=(const char *ascii_text)
+UncText &UncText::operator+=(const char *ascii_text)
 {
    append(ascii_text);
    return(*this);
 }
 
 
-const unc_text::value_type &unc_text::get() const
+const UncText::value_type &UncText::get() const
 {
    return(m_chars);
 }
 
 
-int unc_text::operator[](size_t idx) const
+int UncText::operator[](size_t idx) const
 {
    return((idx < m_chars.size()) ? m_chars[idx] : 0);
 }
 
 
-const int &unc_text::at(size_t idx) const
+const int &UncText::at(size_t idx) const
 {
    return(m_chars.at(idx));
 }
 
 
-const int &unc_text::back() const
+int &UncText::at(size_t idx)
+{
+   return(m_chars.at(idx));
+}
+
+
+const int &UncText::back() const
 {
    return(m_chars.back());
 }
 
 
-void unc_text::push_back(int ch)
+void UncText::push_back(int ch)
 {
    append(ch);
 }
 
 
-void unc_text::pop_back()
+void UncText::pop_back()
 {
    if (size() == 0)
    {
@@ -261,7 +268,7 @@ void unc_text::pop_back()
 }
 
 
-void unc_text::pop_front()
+void UncText::pop_front()
 {
    if (size() == 0)
    {
@@ -272,7 +279,7 @@ void unc_text::pop_front()
 }
 
 
-void unc_text::update_logtext()
+void UncText::update_logtext()
 {
    // make a pessimistic guess at the size
    m_logtext.clear();
@@ -287,7 +294,7 @@ void unc_text::update_logtext()
 }
 
 
-int unc_text::compare(const unc_text &ref1, const unc_text &ref2, size_t len, bool tcare)
+int UncText::compare(const UncText &ref1, const UncText &ref2, size_t len, bool tcare)
 {
    const size_t len1    = ref1.size();
    const size_t len2    = ref2.size();
@@ -331,10 +338,10 @@ int unc_text::compare(const unc_text &ref1, const unc_text &ref2, size_t len, bo
    }
    // underflow save: return(len1 - len2);
    return((len1 > len2) ? (len1 - len2) : -static_cast<int>(len2 - len1));
-} // unc_text::compare
+} // UncText::compare
 
 
-bool unc_text::equals(const unc_text &ref) const
+bool UncText::equals(const UncText &ref) const
 {
    const size_t len = size();
 
@@ -355,13 +362,13 @@ bool unc_text::equals(const unc_text &ref) const
 }
 
 
-const char *unc_text::c_str() const
+const char *UncText::c_str() const
 {
    return(reinterpret_cast<const char *>(&m_logtext[0]));
 }
 
 
-void unc_text::set(int ch)
+void UncText::set(int ch)
 {
    m_logtext.clear();
    toLogTextUtf8(ch, m_logtext);
@@ -373,14 +380,14 @@ void unc_text::set(int ch)
 }
 
 
-void unc_text::set(const unc_text &ref)
+void UncText::set(const UncText &ref)
 {
    m_chars   = ref.m_chars;
    m_logtext = ref.m_logtext;
 }
 
 
-void unc_text::set(const unc_text &ref, size_t idx, size_t len)
+void UncText::set(const UncText &ref, size_t idx, size_t len)
 {
    const auto ref_size = ref.size();
 
@@ -405,7 +412,7 @@ void unc_text::set(const unc_text &ref, size_t idx, size_t len)
 }
 
 
-void unc_text::set(const string &ascii_text)
+void UncText::set(const string &ascii_text)
 {
    const size_t len = ascii_text.size();
 
@@ -420,7 +427,7 @@ void unc_text::set(const string &ascii_text)
 }
 
 
-void unc_text::set(const char *ascii_text)
+void UncText::set(const char *ascii_text)
 {
    const size_t len = strlen(ascii_text);
 
@@ -435,7 +442,7 @@ void unc_text::set(const char *ascii_text)
 }
 
 
-void unc_text::set(const value_type &data, size_t idx, size_t len)
+void UncText::set(const value_type &data, size_t idx, size_t len)
 {
    m_chars.resize(len);
 
@@ -452,7 +459,7 @@ void unc_text::set(const value_type &data, size_t idx, size_t len)
 }
 
 
-void unc_text::resize(size_t new_size)
+void UncText::resize(size_t new_size)
 {
    if (size() == new_size)
    {
@@ -468,7 +475,7 @@ void unc_text::resize(size_t new_size)
 }
 
 
-void unc_text::clear()
+void UncText::clear()
 {
    m_logtext.clear();
    m_logtext.push_back('\0');
@@ -478,7 +485,7 @@ void unc_text::clear()
 }
 
 
-void unc_text::insert(size_t idx, int ch)
+void UncText::insert(size_t idx, int ch)
 {
    if (idx >= m_chars.size())
    {
@@ -502,7 +509,7 @@ void unc_text::insert(size_t idx, int ch)
 }
 
 
-void unc_text::insert(size_t idx, const unc_text &ref)
+void UncText::insert(size_t idx, const UncText &ref)
 {
    if (ref.size() == 0)
    {
@@ -529,7 +536,7 @@ void unc_text::insert(size_t idx, const unc_text &ref)
 }
 
 
-void unc_text::append(int ch)
+void UncText::append(int ch)
 {
    m_logtext.pop_back();
 
@@ -555,7 +562,7 @@ void unc_text::append(int ch)
 }
 
 
-void unc_text::append(const unc_text &ref)
+void UncText::append(const UncText &ref)
 {
    if (ref.size() == 0)
    {
@@ -569,31 +576,31 @@ void unc_text::append(const unc_text &ref)
 }
 
 
-void unc_text::append(const string &ascii_text)
+void UncText::append(const string &ascii_text)
 {
-   unc_text tmp(ascii_text);
+   UncText tmp(ascii_text);
 
    append(tmp);
 }
 
 
-void unc_text::append(const char *ascii_text)
+void UncText::append(const char *ascii_text)
 {
-   unc_text tmp(ascii_text);
+   UncText tmp(ascii_text);
 
    append(tmp);
 }
 
 
-void unc_text::append(const value_type &data, size_t idx, size_t len)
+void UncText::append(const value_type &data, size_t idx, size_t len)
 {
-   unc_text tmp(data, idx, len);
+   UncText tmp(data, idx, len);
 
    append(tmp);
 }
 
 
-bool unc_text::startswith(const char *text, size_t idx) const
+bool UncText::startswith(const char *text, size_t idx) const
 {
    const auto orig_idx = idx;
 
@@ -613,7 +620,7 @@ bool unc_text::startswith(const char *text, size_t idx) const
 }
 
 
-bool unc_text::startswith(const unc_text &text, size_t idx) const
+bool UncText::startswith(const UncText &text, size_t idx) const
 {
    size_t     si       = 0;
    const auto orig_idx = idx;
@@ -634,7 +641,7 @@ bool unc_text::startswith(const unc_text &text, size_t idx) const
 }
 
 
-int unc_text::find(const char *search_txt, size_t start_idx) const
+int UncText::find(const char *search_txt, size_t start_idx) const
 {
    const size_t t_len = strlen(search_txt); // the length of 'text' we are looking for
    const size_t s_len = size();             // the length of the string we are looking in
@@ -669,7 +676,7 @@ int unc_text::find(const char *search_txt, size_t start_idx) const
 }
 
 
-int unc_text::rfind(const char *search_txt, size_t start_idx) const
+int UncText::rfind(const char *search_txt, size_t start_idx) const
 {
    const size_t t_len = strlen(search_txt); // the length of 'text' we are looking for
    const size_t s_len = size();             // the length of the string we are looking in
@@ -709,7 +716,7 @@ int unc_text::rfind(const char *search_txt, size_t start_idx) const
 }
 
 
-void unc_text::erase(size_t start_idx, size_t len)
+void UncText::erase(size_t start_idx, size_t len)
 {
    if (len == 0)
    {
@@ -736,7 +743,7 @@ void unc_text::erase(size_t start_idx, size_t len)
 }
 
 
-int unc_text::replace(const char *search_text, const unc_text &replace_text)
+int UncText::replace(const char *search_text, const UncText &replace_text)
 {
    const size_t s_len = strlen(search_text);
    const size_t r_len = replace_text.size();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_text.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/unc_text.h
index dd678f16..22217f3b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_text.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/unc_text.h
@@ -23,27 +23,27 @@
  * - unc_text - uncrustify text
  */
 
-class unc_text
+class UncText
 {
 public:
    typedef std::deque<int>      value_type; // double encoded list of int values
    typedef std::vector<UINT8>   log_type;
 
 
-   unc_text();
+   UncText();
 
-   unc_text(const unc_text &ref);
+   UncText(const UncText &ref);
 
-   unc_text(const unc_text &ref, size_t idx, size_t len = 0);
+   UncText(const UncText &ref, size_t idx, size_t len = 0);
 
-   unc_text(const char *ascii_text);
+   UncText(const char *ascii_text);
 
-   unc_text(const std::string &ascii_text);
+   UncText(const std::string &ascii_text);
 
-   unc_text(const value_type &data, size_t idx = 0, size_t len = 0);
+   UncText(const value_type &data, size_t idx = 0, size_t len = 0);
 
 
-   ~unc_text() = default;
+   ~UncText() = default;
 
 
    void resize(size_t new_size);
@@ -58,9 +58,9 @@ public:
 
    void set(int ch);
 
-   void set(const unc_text &ref);
+   void set(const UncText &ref);
 
-   void set(const unc_text &ref, size_t idx, size_t len = 0);
+   void set(const UncText &ref, size_t idx, size_t len = 0);
 
    void set(const std::string &ascii_text);
 
@@ -69,18 +69,18 @@ public:
    void set(const value_type &data, size_t idx = 0, size_t len = 0);
 
 
-   unc_text &operator=(int ch);
+   UncText &operator=(int ch);
 
-   unc_text &operator=(const unc_text &ref);
+   UncText &operator=(const UncText &ref);
 
-   unc_text &operator=(const std::string &ascii_text);
+   UncText &operator=(const std::string &ascii_text);
 
-   unc_text &operator=(const char *ascii_text);
+   UncText &operator=(const char *ascii_text);
 
 
    void insert(size_t idx, int ch);
 
-   void insert(size_t idx, const unc_text &ref);
+   void insert(size_t idx, const UncText &ref);
 
 
    void erase(size_t idx, size_t len = 1);
@@ -89,7 +89,7 @@ public:
    //! Add a unc_text character to an unc_text
    void append(int ch);
 
-   void append(const unc_text &ref);
+   void append(const UncText &ref);
 
    //! Add a string to an unc_text
    void append(const std::string &ascii_text);
@@ -107,13 +107,13 @@ public:
    void append(const value_type &data, size_t idx = 0, size_t len = 0);
 
 
-   unc_text &operator+=(int ch);
+   UncText &operator+=(int ch);
 
-   unc_text &operator+=(const unc_text &ref);
+   UncText &operator+=(const UncText &ref);
 
-   unc_text &operator+=(const std::string &ascii_text);
+   UncText &operator+=(const std::string &ascii_text);
 
-   unc_text &operator+=(const char *ascii_text);
+   UncText &operator+=(const char *ascii_text);
 
 
    //! Returns the UTF-8 string for logging
@@ -132,10 +132,10 @@ public:
     * @retval  > 0
     * @retval  < 0
     */
-   static int compare(const unc_text &ref1, const unc_text &ref2, size_t len = 0, bool tcare = false);
+   static int compare(const UncText &ref1, const UncText &ref2, size_t len = 0, bool tcare = false);
 
 
-   bool equals(const unc_text &ref) const;
+   bool equals(const UncText &ref) const;
 
 
    //! grab the data as a series of ints for outputting to a file
@@ -147,6 +147,7 @@ public:
 
    // throws an exception if out of bounds
    const int &at(size_t idx) const;
+   int &at(size_t idx);
 
 
    //! returns the last element of the character list
@@ -162,13 +163,13 @@ public:
    void pop_front();
 
 
-   bool startswith(const unc_text &text, size_t idx = 0) const;
+   bool startswith(const UncText &text, size_t idx = 0) const;
 
    bool startswith(const char *text, size_t idx = 0) const;
 
 
    /**
-    * look for 'text', beginning with position 'sidx'
+    * look for 'text', beginning with position 'idx'
     *
     * @param text  text to search for
     * @param idx   position to start search
@@ -182,7 +183,7 @@ public:
    int rfind(const char *text, size_t idx = 0) const;
 
 
-   int replace(const char *oldtext, const unc_text &newtext);
+   int replace(const char *oldtext, const UncText &newtext);
 
 
 protected:
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_tools.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/unc_tools.cpp
index 47425a83..0da2bdd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_tools.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/unc_tools.cpp
@@ -3,7 +3,7 @@
  * This file contains lot of tools for debugging
  *
  * @author  Guy Maurel
- *          October 2015- 2021
+ *          October 2015- 2023
  * @license GPL v2+
  */
 
@@ -12,6 +12,7 @@
 #include "args.h"
 #include "output.h"
 
+constexpr static auto LCURRENT = LGUY;
 
 /*
  * the test suite Coveralls: https://coveralls.io
@@ -122,6 +123,12 @@ void prot_the_line_pc(Chunk *pc_sub, const char *func_name, int theLine, unsigne
                log_pcf_flags(LGUY, pc->GetFlags());
             }
 
+            if (pc->Is(CT_COND_COLON))
+            {
+               Chunk *pa = pc->GetParent();
+               LOG_FMT(LGUY, "<> pa-type is %s, orig_line is %zu\n", get_token_name(pa->GetType()), pa->GetOrigLine());
+            }
+
             if (pc->GetTrackingData() != nullptr)
             {
                LOG_FMT(LGUY, " Tracking info are: \n");
@@ -129,10 +136,10 @@ void prot_the_line_pc(Chunk *pc_sub, const char *func_name, int theLine, unsigne
 
                for (size_t track = 0; track < pc->GetTrackingData()->size(); track++)
                {
-                  const track_list *A       = pc->GetTrackingData();
-                  const Track_nr   B        = A->at(track);
-                  size_t           Bfirst   = B.first;
-                  char             *Bsecond = B.second;
+                  const TrackList   *A       = pc->GetTrackingData();
+                  const TrackNumber 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);
@@ -146,6 +153,151 @@ void prot_the_line_pc(Chunk *pc_sub, const char *func_name, int theLine, unsigne
 } // prot_the_line_pc
 
 
+void prot_the_columns(int theLine, unsigned int actual_line)
+{
+   if (actual_line == 0)
+   {
+      // use the option debug_line_number_to_protocol.
+      actual_line = options::debug_line_number_to_protocol();
+
+      if (actual_line == 0)
+      {
+         // don't make any protocol.
+         return;
+      }
+   }
+   counter++;
+   LOG_FMT(LGUY, "%4d:", theLine);
+
+   for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
+   {
+      if (pc->GetOrigLine() == actual_line)
+      {
+         LOG_FMT(LGUY, "%4zu,",
+                 pc->GetColumn());
+      }
+   }
+
+   LOG_FMT(LGUY, "                 (%2zu)\n", counter);
+} // prot_the_columns
+
+
+void prot_the_OrigCols(int theLine, unsigned int actual_line)
+{
+   if (actual_line == 0)
+   {
+      // use the option debug_line_number_to_protocol.
+      actual_line = options::debug_line_number_to_protocol();
+
+      if (actual_line == 0)
+      {
+         // don't make any protocol.
+         return;
+      }
+   }
+   counter++;
+   LOG_FMT(LGUY, "%4d:", theLine);
+
+   for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
+   {
+      if (pc->GetOrigLine() == actual_line)
+      {
+         LOG_FMT(LGUY, "%4zu,",
+                 pc->GetOrigCol());
+      }
+   }
+
+   LOG_FMT(LGUY, "                 (%2zu)\n", counter);
+} // prot_the_OrigCols
+
+
+void rebuild_the_line(int theLine, unsigned int actual_line, bool increment)
+{
+#define MANY    1000
+
+   if (actual_line == 0)
+   {
+      // use the option debug_line_number_to_protocol.
+      actual_line = options::debug_line_number_to_protocol();
+
+      if (actual_line == 0)
+      {
+         // don't make any protocol.
+         return;
+      }
+   }
+   char rebuildLine[MANY];
+   char virtualLine[MANY];
+
+   // fill the array
+   for (size_t where = 0; where < MANY; where++)
+   {
+      rebuildLine[where] = ' ';
+      virtualLine[where] = '_';
+   }
+
+   rebuildLine[MANY - 1] = '\0';
+   virtualLine[MANY - 1] = '\0';
+   LOG_FMT(LGUY, "%4d:", theLine);
+
+   size_t len0 = 0;
+   bool   has_a_virtual_brace;
+   has_a_virtual_brace = false;
+
+   for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
+   {
+      if (pc->GetOrigLine() == actual_line)
+      {
+         if (pc->Is(CT_NEWLINE))
+         {
+            size_t col  = pc->GetColumn();
+            size_t len1 = pc->Len();
+            len0              = col + len1 - 1;
+            rebuildLine[len0] = '\0';
+            virtualLine[len0] = '\0';
+            break;
+         }
+         else if (  pc->Is(CT_VBRACE_OPEN)
+                 || pc->Is(CT_VBRACE_CLOSE))
+         {
+            has_a_virtual_brace = true;
+            size_t col = pc->GetOrigCol();
+            virtualLine[col - 1] = 'V';
+         }
+         else
+         {
+            size_t     col  = pc->GetColumn();
+            size_t     len1 = pc->Len();
+            const char *A   = pc->Text();
+
+            for (size_t x = 0; x < len1; x++)
+            {
+               char B = A[x];
+
+               if (col + x >= MANY)
+               {
+                  LOG_FMT(LGUY, " ***** MANY is too little for this line %d\n", theLine);
+                  exit(EX_SOFTWARE);
+               }
+               rebuildLine[col + x - 1] = B;
+            }
+         }
+      }
+   }
+
+   if (increment)
+   {
+      counter++;
+   }
+   LOG_FMT(LGUY, "%s            , counter is %zu\n", rebuildLine, counter);
+
+   if (has_a_virtual_brace)
+   {
+      LOG_FMT(LGUY, "VIRT:%s\n", virtualLine);
+   }
+} // rebuild_the_line
+
+
 void prot_all_lines(const char *func_name, int theLine)
 {
    counter++;
@@ -494,3 +646,77 @@ size_t get_A_Number()
    number = number + 1;
    return(number);
 }
+
+
+void dump_keyword_for_lang(size_t language_count, chunk_tag_t *keyword_for_lang)
+{
+   LOG_FMT(LDYNKW, "%s:                      tag            type        flags\n", __func__);
+
+   for (size_t ii = 0; ii < language_count; ii++)
+   {
+      std::bitset<16> bit_a;
+      bit_a = keyword_for_lang[ii].lang_flags;
+      std::string     g_a;
+      g_a = bit_a.to_string();
+      LOG_FMT(LDYNKW, "%s: %3zu: %18s, %14s, %12ld, %16s, %s\n",
+              __func__, ii,
+              keyword_for_lang[ii].tag, get_token_name(keyword_for_lang[ii].type),
+              (long)keyword_for_lang[ii].lang_flags,
+              g_a.data(),
+              language_name_from_flags(keyword_for_lang[ii].lang_flags));
+   }
+}
+
+
+void dump_step(const char *filename, const char *step_description)
+{
+   static int file_num = 0;
+   char       buffer[256];
+   FILE       *dump_file;
+
+   if (  filename == nullptr
+      || strlen(filename) == 0)
+   {
+      return;
+   }
+
+   // On the first call, also save the options in use
+   if (file_num == 0)
+   {
+      snprintf(buffer, 256, "New dump file: %s_%03d.log - Options in use", filename, file_num);
+      log_rule_B(buffer);
+
+      snprintf(buffer, 256, "%s_%03d.log", filename, file_num);
+      ++file_num;
+
+      dump_file = fopen(buffer, "wb");
+
+      if (dump_file != nullptr)
+      {
+         save_option_file(dump_file, false, true);
+         fclose(dump_file);
+      }
+   }
+   snprintf(buffer, 256, "New dump file: %s_%03d.log - %s", filename, file_num, step_description);
+   log_rule_B(buffer);
+
+   snprintf(buffer, 256, "%s_%03d.log", filename, file_num);
+   ++file_num;
+
+   dump_file = fopen(buffer, "wb");
+
+   if (dump_file != nullptr)
+   {
+      fprintf(dump_file, "STEP: %s\n--------------\n", step_description);
+      output_parsed(dump_file, false);
+      fclose(dump_file);
+   }
+} // dump_step
+
+char dump_file_name[80];
+
+
+void set_dump_file_name(const char *name)
+{
+   sprintf(dump_file_name, "%s", name);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_tools.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/unc_tools.h
index acd199b9..6cae2ff6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unc_tools.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/unc_tools.h
@@ -2,7 +2,7 @@
  * @file unc_tools.h
  *
  * @author  Guy Maurel
- *          October 2015, 2016, 2017, 2018, 2019, 2020, 2021
+ *          October 2015, 2023
  * @license GPL v2+
  */
 
@@ -17,6 +17,10 @@
 #define PROT_THE_LINE    /* do nothing */;
 #endif
 
+extern char dump_file_name[80];
+
+void set_dump_file_name(const char *name);
+
 
 void prot_the_line(const char *func_name, int theLine, unsigned int actual_line, size_t partNumber);
 
@@ -30,6 +34,15 @@ void prot_all_lines(const char *func_name, int theLine);
 void prot_the_source(int theLine);
 
 
+void prot_the_columns(int theLine, unsigned int actual_line);
+
+
+void prot_the_OrigCols(int theLine, unsigned int actual_line);
+
+
+void rebuild_the_line(int theLine, unsigned int actual_line, bool increment = true);
+
+
 void examine_Data(const char *func_name, int theLine, int what);
 
 
@@ -43,4 +56,11 @@ void dump_in(unsigned int type);
 
 size_t get_A_Number();
 
+
+void dump_keyword_for_lang(size_t language_count, chunk_tag_t *keyword_for_lang);
+
+//! This save the next formatting step to a file
+void dump_step(const char *filename, const char *description);
+
+
 #endif /* UNC_TOOLS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/uncrustify.cpp
index 523dd2c3..0a7bda62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/uncrustify.cpp
@@ -26,6 +26,9 @@
 #include "indent.h"
 #include "keywords.h"
 #include "lang_pawn.h"
+#include "language_names.h"
+#include "mark_functor.h"
+#include "mark_question_colon.h"
 #include "newlines.h"
 #include "output.h"
 #include "parameter_pack_cleanup.h"
@@ -89,9 +92,6 @@ using namespace uncrustify;
 cp_data_t cpd;
 
 
-static size_t language_flags_from_name(const char *tag);
-
-
 /**
  * Find the language for the file extension
  * Defaults to C
@@ -99,7 +99,7 @@ static size_t language_flags_from_name(const char *tag);
  * @param filename   The name of the file
  * @return           LANG_xxx
  */
-static size_t language_flags_from_filename(const char *filename);
+//static size_t language_flags_from_filename(const char *filename);
 
 
 static bool read_stdin(file_mem &fm);
@@ -108,9 +108,6 @@ static bool read_stdin(file_mem &fm);
 static void uncrustify_start(const deque<int> &data);
 
 
-static bool ends_with(const char *filename, const char *tag, bool case_sensitive);
-
-
 /**
  * Does a source file.
  *
@@ -120,8 +117,9 @@ static bool ends_with(const char *filename, const char *tag, bool case_sensitive
  * @param dump_file    nullptr or the filename prefix for dumping formatting steps debug info
  * @param no_backup    don't create a backup, if filename_out == filename_in
  * @param keep_mtime   don't change the mtime (dangerous)
+ * @param is_quiet     whether output should be quiet
  */
-static void do_source_file(const char *filename_in, const char *filename_out, const char *parsed_file, const char *dump_file, bool no_backup, bool keep_mtime);
+static void do_source_file(const char *filename_in, const char *filename_out, const char *parsed_file, const char *dump_file, bool no_backup, bool keep_mtime, bool is_quiet);
 
 
 static void add_file_header();
@@ -136,7 +134,7 @@ static void add_func_header(E_Token type, file_mem &fm);
 static void add_msg_header(E_Token type, file_mem &fm);
 
 
-static void process_source_list(const char *source_list, const char *prefix, const char *suffix, bool no_backup, bool keep_mtime);
+static void process_source_list(const char *source_list, const char *prefix, const char *suffix, bool no_backup, bool keep_mtime, bool is_quiet);
 
 
 static const char *make_output_filename(char *buf, size_t buf_size, const char *filename, const char *prefix, const char *suffix);
@@ -146,10 +144,7 @@ static const char *make_output_filename(char *buf, size_t buf_size, const char *
 static bool file_content_matches(const string &filename1, const string &filename2);
 
 
-static string fix_filename(const char *filename);
-
-
-static bool bout_content_matches(const file_mem &fm, bool report_status);
+static bool bout_content_matches(const file_mem &fm, bool report_status, bool is_quiet);
 
 
 /**
@@ -302,8 +297,9 @@ void usage(const char *argv0)
            " -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 space tracking information for debugging.\n"
-           " --tracking_nl FILE    : Prepare newline tracking information for debugging.\n"
+           " --tracking space:FILE : Prepare space tracking information for debugging.\n"
+           " --tracking nl:FILE    : Prepare newline tracking information for debugging.\n"
+           " --tracking start:FILE : Prepare start of statement tracking information for debugging.\n"
            "                         Cannot be used with the -o option'\n"
            "\n"
            "Usage Examples\n"
@@ -560,12 +556,15 @@ int main(int argc, char *argv[])
       }
    }
    // Get the dump file name prefix
-   const char *dump_file;
+   const char *dump_file_T;
 
-   if (  ((dump_file = arg.Param("--dump-steps")) != nullptr)
-      || ((dump_file = arg.Param("-ds")) != nullptr))
+   if (  ((dump_file_T = arg.Param("--dump-steps")) != nullptr)
+      || ((dump_file_T = arg.Param("-ds")) != nullptr))
    {
-      LOG_FMT(LNOTE, "Will export formatting steps data to '%s_nnn.log' files\n", dump_file);
+      // and save it
+      // Issue #3976
+      set_dump_file_name(dump_file_T);
+      LOG_FMT(LNOTE, "Will export formatting steps data to '%s_nnn.log' files\n", dump_file_name);
    }
 
    // Enable log severities
@@ -632,6 +631,7 @@ int main(int argc, char *argv[])
    bool        update_config_wd = arg.Present("--update-config-with-doc");
    bool        detect           = arg.Present("--detect");
    bool        pfile_csv        = arg.Present("--debug-csv-format");
+   bool        is_quiet         = arg.Present("-q");
 
    std::string parsed_file_csv;
 
@@ -660,47 +660,66 @@ int main(int argc, char *argv[])
    const char *output_file = arg.Param("-o");
 
    // for debugging tracking
-   const char *html_file = nullptr;
-   html_file = arg.Param("--tracking_space");
+   const char *html_arg = nullptr;
+   html_arg = arg.Param("--tracking");
 
-   if (html_file != nullptr)
+   if (html_arg != nullptr)
    {
-      cpd.html_type = tracking_type_e::TT_SPACE;
-      cpd.html_file = html_file;
-      html_file     = arg.Param("--tracking_nl");
-      bool try_it = html_file != nullptr;
+      const size_t max_args_length = 256;
+      size_t       argLength       = strlen(html_arg);
 
-      if (try_it)
+      if (argLength > max_args_length)
       {
-         usage_error("Cannot specify both --tracking_space and --tracking_nl.");
-         return(EX_NOUSER);
+         fprintf(stderr, "The buffer is to short for the tracking argument '%s'\n", html_arg);
+         log_flush(true);
+         exit(EX_SOFTWARE);
       }
-   }
-   else
-   {
-      html_file = arg.Param("--tracking_nl");
-      bool try_it = html_file != nullptr;
+      char buffer[max_args_length];
+      strcpy(buffer, html_arg);
 
-      if (try_it)
+      // Tokenize and extract key and value
+      const char *tracking_art = strtok(buffer, ":");
+      const char *html_file    = strtok(nullptr, ":");
+
+      if (html_file != nullptr)
       {
-         cpd.html_type = tracking_type_e::TT_NEWLINE;
+         if (strcmp(tracking_art, "space") == 0)
+         {
+            cpd.html_type = tracking_type_e::TT_SPACE;
+         }
+         else if (strcmp(tracking_art, "nl") == 0)
+         {
+            cpd.html_type = tracking_type_e::TT_NEWLINE;
+         }
+         else if (strcmp(tracking_art, "start") == 0)
+         {
+            cpd.html_type = tracking_type_e::TT_START;
+         }
+         else
+         {
+            fprintf(stderr, "tracking_art '%s' not implemented\n",
+                    tracking_art);
+            log_flush(true);
+            return(EXIT_FAILURE);
+         }
          cpd.html_file = html_file;
       }
    }
    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 != nullptr) ? output_file : "null");
-   LOG_FMT(LDATA, "source_file = %s\n", (source_file != nullptr) ? source_file : "null");
-   LOG_FMT(LDATA, "source_list = %s\n", (source_list != nullptr) ? source_list : "null");
-   LOG_FMT(LDATA, "tracking    = %s\n", (cpd.html_file != nullptr) ? cpd.html_file : "null");
-   LOG_FMT(LDATA, "prefix      = %s\n", (prefix != nullptr) ? prefix : "null");
-   LOG_FMT(LDATA, "suffix      = %s\n", (suffix != nullptr) ? suffix : "null");
-   LOG_FMT(LDATA, "assume      = %s\n", (assume != nullptr) ? assume : "null");
-   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");
+   LOG_FMT(LDATA, "config_file  = %s\n", cfg_file.c_str());
+   LOG_FMT(LDATA, "output_file  = %s\n", (output_file != nullptr) ? output_file : "null");
+   LOG_FMT(LDATA, "source_file  = %s\n", (source_file != nullptr) ? source_file : "null");
+   LOG_FMT(LDATA, "source_list  = %s\n", (source_list != nullptr) ? source_list : "null");
+   LOG_FMT(LDATA, "tracking_art = %s\n", get_tracking_type_e_name(cpd.html_type));
+   LOG_FMT(LDATA, "tracking     = %s\n", (cpd.html_file != nullptr) ? cpd.html_file : "null");
+   LOG_FMT(LDATA, "prefix       = %s\n", (prefix != nullptr) ? prefix : "null");
+   LOG_FMT(LDATA, "suffix       = %s\n", (suffix != nullptr) ? suffix : "null");
+   LOG_FMT(LDATA, "assume       = %s\n", (assume != nullptr) ? assume : "null");
+   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
@@ -780,11 +799,10 @@ int main(int argc, char *argv[])
    // Set config options using command line arguments.
    idx = 0;
 
-   const size_t max_args_length = 256;
-
    while ((p_arg = arg.Params("--set", idx)) != nullptr)
    {
-      size_t argLength = strlen(p_arg);
+      size_t       argLength       = strlen(p_arg);
+      const size_t max_args_length = 256;
 
       if (argLength > max_args_length)
       {
@@ -860,7 +878,7 @@ int main(int argc, char *argv[])
 #else
    if (options::debug_timeout() > 0)
    {
-      alarm(options::debug_timeout());
+      alarm((unsigned int)options::debug_timeout());
    }
 #endif // ifdef WIN32
 
@@ -931,7 +949,8 @@ int main(int argc, char *argv[])
 
    // Check args - for multifile options
    if (  source_list != nullptr
-      || p_arg != nullptr)
+      || (  p_arg != nullptr
+         && cpd.html_type == tracking_type_e::TT_NONE))           // Issue #4066
    {
       if (source_file != nullptr)
       {
@@ -1004,12 +1023,12 @@ int main(int argc, char *argv[])
 
       // Issue #3427
       init_keywords_for_language();
-      uncrustify_file(fm, stdout, parsed_file, dump_file);
+      uncrustify_file(fm, stdout, parsed_file, dump_file_name, is_quiet);
    }
    else if (source_file != nullptr)
    {
       // Doing a single file
-      do_source_file(source_file, output_file, parsed_file, dump_file, no_backup, keep_mtime);
+      do_source_file(source_file, output_file, parsed_file, dump_file_name, no_backup, keep_mtime, is_quiet);
    }
    else
    {
@@ -1020,7 +1039,7 @@ int main(int argc, char *argv[])
          exit(EX_CONFIG);
       }
 
-      if (dump_file != nullptr)
+      if (dump_file_name[0] != char(0))                // Issue #3976
       {
          fprintf(stderr, "FAIL: -ds/--dump-steps option must be used with the -f option\n");
          log_flush(true);
@@ -1045,12 +1064,12 @@ int main(int argc, char *argv[])
          char outbuf[1024];
          do_source_file(p_arg,
                         make_output_filename(outbuf, sizeof(outbuf), p_arg, prefix, suffix),
-                        nullptr, nullptr, no_backup, keep_mtime);
+                        nullptr, nullptr, no_backup, keep_mtime, is_quiet);
       }
 
       if (source_list != nullptr)
       {
-         process_source_list(source_list, prefix, suffix, no_backup, keep_mtime);
+         process_source_list(source_list, prefix, suffix, no_backup, keep_mtime, is_quiet);
       }
    }
    clear_keyword_file();
@@ -1066,7 +1085,7 @@ int main(int argc, char *argv[])
 
 static void process_source_list(const char *source_list,
                                 const char *prefix, const char *suffix,
-                                bool no_backup, bool keep_mtime)
+                                bool no_backup, bool keep_mtime, bool is_quiet)
 {
    bool from_stdin = strcmp(source_list, "-") == 0;
    FILE *p_file    = from_stdin ? stdin : fopen(source_list, "r");
@@ -1114,7 +1133,7 @@ static void process_source_list(const char *source_list,
          char outbuf[1024];
          do_source_file(fname,
                         make_output_filename(outbuf, sizeof(outbuf), fname, prefix, suffix),
-                        nullptr, nullptr, no_backup, keep_mtime);
+                        nullptr, nullptr, no_backup, keep_mtime, is_quiet);
       }
    }
 
@@ -1432,25 +1451,7 @@ static bool file_content_matches(const string &filename1, const string &filename
 } // file_content_matches
 
 
-static string fix_filename(const char *filename)
-{
-   char   *tmp_file;
-   string rv;
-
-   // Create 'outfile.uncrustify'
-   tmp_file = new char[strlen(filename) + 16 + 1]; // + 1 for '//  + 1 for '/* + 1 for '\0' */' '
-
-   if (tmp_file != nullptr)
-   {
-      sprintf(tmp_file, "%s.uncrustify", filename);
-   }
-   rv = tmp_file;
-   delete[] tmp_file;
-   return(rv);
-}
-
-
-static bool bout_content_matches(const file_mem &fm, bool report_status)
+static bool bout_content_matches(const file_mem &fm, bool report_status, bool is_quiet)
 {
    bool is_same = true;
 
@@ -1487,8 +1488,11 @@ static bool bout_content_matches(const file_mem &fm, bool report_status)
    if (  is_same
       && report_status)
    {
-      fprintf(stdout, "PASS: %s (%u bytes)\n",
-              cpd.filename.c_str(), static_cast<int>(fm.raw.size()));
+      if (!is_quiet)
+      {
+         fprintf(stdout, "PASS: %s (%u bytes)\n",
+                 cpd.filename.c_str(), static_cast<int>(fm.raw.size()));
+      }
    }
    return(is_same);
 } // bout_content_matches
@@ -1499,7 +1503,8 @@ static void do_source_file(const char *filename_in,
                            const char *parsed_file,
                            const char *dump_file,
                            bool       no_backup,
-                           bool       keep_mtime)
+                           bool       keep_mtime,
+                           bool       is_quiet)
 {
    FILE     *pfout      = nullptr;
    bool     did_open    = false;
@@ -1520,8 +1525,8 @@ static void do_source_file(const char *filename_in,
       LOG_FMT(LERR, "Failed to load (%s)\n", filename_in);
       exit(EX_IOERR);
    }
-   LOG_FMT(LSYS, "%s(%d): Parsing: %s as language %s\n",
-           __func__, __LINE__, filename_in, language_name_from_flags(cpd.lang_flags));
+   LOG_FMT(LSYS, "%s: Parsing: %s as language %s\n",
+           __func__, filename_in, language_name_from_flags(cpd.lang_flags));
 
    // check keyword sort
    assert(keywords_are_sorted());
@@ -1545,9 +1550,9 @@ static void do_source_file(const char *filename_in,
        * Cleanup is deferred because we need 'bout' preserved long enough
        * to write it to a file (if it changed).
        */
-      uncrustify_file(fm, nullptr, parsed_file, dump_file, true);
+      uncrustify_file(fm, nullptr, parsed_file, dump_file, is_quiet, true);
 
-      if (bout_content_matches(fm, false))
+      if (bout_content_matches(fm, false, is_quiet))
       {
          uncrustify_end();
          return;
@@ -1568,7 +1573,7 @@ static void do_source_file(const char *filename_in,
          if (strcmp(filename_in, filename_out) == 0)
          {
             // Create 'outfile.uncrustify'
-            filename_tmp = fix_filename(filename_out);
+            filename_tmp += ".uncrustify";
 
             if (!no_backup)
             {
@@ -1607,7 +1612,7 @@ static void do_source_file(const char *filename_in,
    }
    else
    {
-      uncrustify_file(fm, pfout, parsed_file, dump_file);
+      uncrustify_file(fm, pfout, parsed_file, dump_file, is_quiet);
    }
 
    if (did_open)
@@ -1695,7 +1700,7 @@ static void add_file_footer()
          LOG_FMT(LSYS, "Adding a newline at the end of the file\n");
          newline_add_after(pc);
       }
-      tokenize(cpd.file_ftr.data, nullptr);
+      tokenize(cpd.file_ftr.data, Chunk::NullChunkPtr);
    }
 }
 
@@ -1951,7 +1956,7 @@ static void add_msg_header(E_Token type, file_mem &fm)
 static void uncrustify_start(const deque<int> &data)
 {
    // Parse the text into chunks
-   tokenize(data, nullptr);
+   tokenize(data, Chunk::NullChunkPtr);
    PROT_THE_LINE
 
    cpd.unc_stage = unc_stage_e::HEADER;
@@ -2010,11 +2015,13 @@ static void uncrustify_start(const deque<int> &data)
    combine_labels();
 
    enum_cleanup();
+
+   mark_functor();
 } // uncrustify_start
 
 
 void uncrustify_file(const file_mem &fm, FILE *pfout, const char *parsed_file,
-                     const char *dump_file, bool defer_uncrustify_end)
+                     const char *dump_file, bool is_quiet, bool defer_uncrustify_end)
 {
    const deque<int> &data = fm.data;
 
@@ -2022,13 +2029,12 @@ void uncrustify_file(const file_mem &fm, FILE *pfout, const char *parsed_file,
    cpd.bom = fm.bom;
    cpd.enc = fm.enc;
 
-   log_rule_B("utf8_force");
-   log_rule_B("utf8_byte");
-
    if (  options::utf8_force()
       || (  (cpd.enc == char_encoding_e::e_BYTE)
          && options::utf8_byte()))
    {
+      log_rule_B("utf8_force");
+      log_rule_B("utf8_byte");
       cpd.enc = char_encoding_e::e_UTF8;
    }
    iarf_e av;
@@ -2090,55 +2096,68 @@ void uncrustify_file(const file_mem &fm, FILE *pfout, const char *parsed_file,
     * Done with detection. Do the rest only if the file will go somewhere.
     * The detection code needs as few changes as possible.
     */
+
+   // Add comments before function defs and classes
+   if (!cpd.func_hdr.data.empty())
    {
-      // Add comments before function defs and classes
-      if (!cpd.func_hdr.data.empty())
-      {
-         add_func_header(CT_FUNC_DEF, cpd.func_hdr);
+      log_rule_B("cmt_insert_function_header");
 
-         log_rule_B("cmt_insert_before_ctor_dtor");
+      add_func_header(CT_FUNC_DEF, cpd.func_hdr);
 
-         if (options::cmt_insert_before_ctor_dtor())
-         {
-            add_func_header(CT_FUNC_CLASS_DEF, cpd.func_hdr);
-         }
-      }
-
-      if (!cpd.class_hdr.data.empty())
+      if (options::cmt_insert_before_ctor_dtor())
       {
-         add_func_header(CT_CLASS, cpd.class_hdr);
+         add_func_header(CT_FUNC_CLASS_DEF, cpd.func_hdr);
       }
+   }
 
-      if (!cpd.oc_msg_hdr.data.empty())
-      {
-         add_msg_header(CT_OC_MSG_DECL, cpd.oc_msg_hdr);
-      }
-      do_parent_for_pp();
+   if (!cpd.class_hdr.data.empty())
+   {
+      log_rule_B("cmt_insert_class_header");
+      add_func_header(CT_CLASS, cpd.class_hdr);
+   }
 
-      // Rewrite infinite loops
-      log_rule_B("mod_infinite_loop");
+   if (!cpd.oc_msg_hdr.data.empty())
+   {
+      log_rule_B("cmt_insert_oc_message_header");
+      add_msg_header(CT_OC_MSG_DECL, cpd.oc_msg_hdr);
+   }
+   do_parent_for_pp();
 
-      if (options::mod_infinite_loop())
-      {
-         rewrite_infinite_loops();
-      }
-      do_braces();  // Change virtual braces into real braces...
+   // Rewrite infinite loops
+   if (options::mod_infinite_loop())
+   {
+      log_rule_B("mod_infinite_loop");
+      rewrite_infinite_loops();
+   }
+   // Change virtual braces into real braces
+   do_braces();
 
-      // Scrub extra semicolons
+   // Scrub extra semicolons
+   if (options::mod_remove_extra_semicolon())
+   {
       log_rule_B("mod_remove_extra_semicolon");
+      remove_extra_semicolons();
+   }
 
-      if (options::mod_remove_extra_semicolon())
-      {
-         remove_extra_semicolons();
-      }
-      // Remove unnecessary returns
+   // Remove unnecessary returns
+   if (options::mod_remove_empty_return())
+   {
       log_rule_B("mod_remove_empty_return");
+      remove_extra_returns();
+   }
 
-      if (options::mod_remove_empty_return())
-      {
-         remove_extra_returns();
-      }
-      // Add or remove redundant 'int' keyword of integer types
+   // Add or remove redundant 'int' keyword of integer types
+   if (  (  language_is_set(LANG_C)
+         || language_is_set(LANG_CPP))
+      && (  options::mod_int_short() != IARF_IGNORE
+         || options::mod_short_int() != IARF_IGNORE
+         || options::mod_int_long() != IARF_IGNORE
+         || options::mod_long_int() != IARF_IGNORE
+         || options::mod_int_signed() != IARF_IGNORE
+         || options::mod_signed_int() != IARF_IGNORE
+         || options::mod_int_unsigned() != IARF_IGNORE
+         || options::mod_unsigned_int() != IARF_IGNORE))
+   {
       log_rule_B("mod_int_short");
       log_rule_B("mod_short_int");
       log_rule_B("mod_int_long");
@@ -2147,284 +2166,264 @@ void uncrustify_file(const file_mem &fm, FILE *pfout, const char *parsed_file,
       log_rule_B("mod_signed_int");
       log_rule_B("mod_int_unsigned");
       log_rule_B("mod_unsigned_int");
+      change_int_types();
+   }
 
-      if (  (  language_is_set(LANG_C)
-            || language_is_set(LANG_CPP))
-         && (  options::mod_int_short() != IARF_IGNORE
-            || options::mod_short_int() != IARF_IGNORE
-            || options::mod_int_long() != IARF_IGNORE
-            || options::mod_long_int() != IARF_IGNORE
-            || options::mod_int_signed() != IARF_IGNORE
-            || options::mod_signed_int() != IARF_IGNORE
-            || options::mod_int_unsigned() != IARF_IGNORE
-            || options::mod_unsigned_int() != IARF_IGNORE))
-      {
-         change_int_types();
-      }
-      // Remove duplicate include
+   // Remove duplicate include
+   if (options::mod_remove_duplicate_include())
+   {
       log_rule_B("mod_remove_duplicate_include");
+      remove_duplicate_include();
+   }
+   // Add parens
+   do_parens();
+   do_parens_assign();
+   do_parens_return();
 
-      if (options::mod_remove_duplicate_include())
-      {
-         remove_duplicate_include();
-      }
-      // Add parens
-      do_parens();
-      do_parens_assign();
-      do_parens_return();
-
-      // Modify line breaks as needed
-      bool first = true;
-      int  old_changes;
+   // Modify line breaks as needed
+   bool first = true;
+   int  old_changes;
 
+   if (options::nl_remove_extra_newlines() == 2)
+   {
       log_rule_B("nl_remove_extra_newlines");
+      newlines_remove_newlines();
+   }
+   cpd.pass_count = 3;
 
-      if (options::nl_remove_extra_newlines() == 2)
-      {
-         newlines_remove_newlines();
-      }
-      cpd.pass_count = 3;
-
-      dump_step(dump_file, "Before first while loop");
+   dump_step(dump_file, "Before first while loop");
 
-      do
-      {
-         old_changes = cpd.changes;
+   do
+   {
+      old_changes = cpd.changes;
 
-         LOG_FMT(LNEWLINE, "Newline loop start: %d\n", cpd.changes);
+      LOG_FMT(LNEWLINE, "Newline loop start: %d\n", cpd.changes);
 
-         annotations_newlines();
-         newlines_cleanup_dup();
-         newlines_sparens();
-         newlines_cleanup_braces(first);
-         newlines_cleanup_angles();                           // Issue #1167
+      annotations_newlines();
+      newlines_cleanup_dup();
+      newlines_sparens();
+      newlines_cleanup_braces(first);
+      newlines_cleanup_angles();                           // Issue #1167
 
+      if (options::nl_after_multiline_comment())
+      {
          log_rule_B("nl_after_multiline_comment");
+         newline_after_multiline_comment();
+      }
 
-         if (options::nl_after_multiline_comment())
-         {
-            newline_after_multiline_comment();
-         }
+      if (options::nl_after_label_colon())
+      {
          log_rule_B("nl_after_label_colon");
+         newline_after_label_colon();
+      }
+      newlines_insert_blank_lines();
 
-         if (options::nl_after_label_colon())
-         {
-            newline_after_label_colon();
-         }
-         newlines_insert_blank_lines();
-
+      if (options::pos_bool() != TP_IGNORE)
+      {
          log_rule_B("pos_bool");
+         newlines_chunk_pos(CT_BOOL, options::pos_bool());
+      }
 
-         if (options::pos_bool() != TP_IGNORE)
-         {
-            newlines_chunk_pos(CT_BOOL, options::pos_bool());
-         }
+      if (options::pos_compare() != TP_IGNORE)
+      {
          log_rule_B("pos_compare");
+         newlines_chunk_pos(CT_COMPARE, options::pos_compare());
+      }
 
-         if (options::pos_compare() != TP_IGNORE)
-         {
-            newlines_chunk_pos(CT_COMPARE, options::pos_compare());
-         }
+      if (options::pos_conditional() != TP_IGNORE)
+      {
          log_rule_B("pos_conditional");
+         newlines_chunk_pos(CT_COND_COLON, options::pos_conditional());
+         newlines_chunk_pos(CT_QUESTION, options::pos_conditional());
+      }
 
-         if (options::pos_conditional() != TP_IGNORE)
-         {
-            newlines_chunk_pos(CT_COND_COLON, options::pos_conditional());
-            newlines_chunk_pos(CT_QUESTION, options::pos_conditional());
-         }
+      if (  options::pos_comma() != TP_IGNORE
+         || options::pos_enum_comma() != TP_IGNORE)
+      {
          log_rule_B("pos_comma");
          log_rule_B("pos_enum_comma");
+         newlines_chunk_pos(CT_COMMA, options::pos_comma());
+      }
 
-         if (  options::pos_comma() != TP_IGNORE
-            || options::pos_enum_comma() != TP_IGNORE)
-         {
-            newlines_chunk_pos(CT_COMMA, options::pos_comma());
-         }
+      if (options::pos_assign() != TP_IGNORE)
+      {
          log_rule_B("pos_assign");
+         newlines_chunk_pos(CT_ASSIGN, options::pos_assign());
+      }
 
-         if (options::pos_assign() != TP_IGNORE)
-         {
-            newlines_chunk_pos(CT_ASSIGN, options::pos_assign());
-         }
+      if (options::pos_arith() != TP_IGNORE)
+      {
          log_rule_B("pos_arith");
+         newlines_chunk_pos(CT_ARITH, options::pos_arith());
+         newlines_chunk_pos(CT_CARET, options::pos_arith());
+      }
 
-         if (options::pos_arith() != TP_IGNORE)
-         {
-            newlines_chunk_pos(CT_ARITH, options::pos_arith());
-            newlines_chunk_pos(CT_CARET, options::pos_arith());
-         }
+      if (options::pos_shift() != TP_IGNORE)
+      {
          log_rule_B("pos_shift");
+         newlines_chunk_pos(CT_SHIFT, options::pos_shift());
+      }
+      newlines_class_colon_pos(CT_CLASS_COLON);
+      newlines_class_colon_pos(CT_CONSTR_COLON);
 
-         if (options::pos_shift() != TP_IGNORE)
-         {
-            newlines_chunk_pos(CT_SHIFT, options::pos_shift());
-         }
-         newlines_class_colon_pos(CT_CLASS_COLON);
-         newlines_class_colon_pos(CT_CONSTR_COLON);
-
+      if (options::nl_squeeze_ifdef())
+      {
          log_rule_B("nl_squeeze_ifdef");
+         newlines_squeeze_ifdef();
+      }
 
-         if (options::nl_squeeze_ifdef())
-         {
-            newlines_squeeze_ifdef();
-         }
+      if (options::nl_squeeze_paren_close())
+      {
          log_rule_B("nl_squeeze_paren_close");
+         newlines_squeeze_paren_close();
+      }
+      do_blank_lines();
+      newlines_eat_start_end();
+      newlines_functions_remove_extra_blank_lines();
+      newlines_cleanup_dup();
+      first = false;
+      dump_step(dump_file, "Inside first while loop");
+   } while (  old_changes != cpd.changes
+           && cpd.pass_count-- > 0);
 
-         if (options::nl_squeeze_paren_close())
-         {
-            newlines_squeeze_paren_close();
-         }
-//prot_the_line(__func__, __LINE__, 15, 4);
-         do_blank_lines();
-//prot_the_line(__func__, __LINE__, 15, 4);
-         newlines_eat_start_end();
-         newlines_functions_remove_extra_blank_lines();
-         newlines_cleanup_dup();
-         first = false;
-         dump_step(dump_file, "Inside first while loop");
-      } while (  old_changes != cpd.changes
-              && cpd.pass_count-- > 0);
-
-      mark_comments();
-
-      // Add balanced spaces around nested params
+   mark_comments();
+
+   // Add balanced spaces around nested params
+   if (options::sp_balance_nested_parens())
+   {
       log_rule_B("sp_balance_nested_parens");
+      space_text_balance_nested_parens();
+   }
 
-      if (options::sp_balance_nested_parens())
-      {
-         space_text_balance_nested_parens();
-      }
-      // Scrub certain added semicolons
+   // Scrub certain added semicolons
+   if (  language_is_set(LANG_PAWN)
+      && options::mod_pawn_semicolon())
+   {
       log_rule_B("mod_pawn_semicolon");
+      pawn_scrub_vsemi();
+   }
 
-      if (  language_is_set(LANG_PAWN)
-         && options::mod_pawn_semicolon())
-      {
-         pawn_scrub_vsemi();
-      }
-      // Sort imports/using/include
+   // Sort imports/using/include
+   if (  options::mod_sort_import()
+      || options::mod_sort_include()
+      || options::mod_sort_using())
+   {
       log_rule_B("mod_sort_import");
       log_rule_B("mod_sort_include");
       log_rule_B("mod_sort_using");
+      sort_imports();
+   }
+   // Fix same-line inter-chunk spacing
+   space_text();
 
-      if (  options::mod_sort_import()
-         || options::mod_sort_include()
-         || options::mod_sort_using())
-      {
-         sort_imports();
-      }
-      // Fix same-line inter-chunk spacing
-      space_text();
-
+   if (options::align_pp_define_span() > 0)
+   {
       // Do any aligning of preprocessors
       log_rule_B("align_pp_define_span");
+      align_preprocessor();
+   }
+   // Indent the text
+   indent_preproc();
+   indent_text();
 
-      if (options::align_pp_define_span() > 0)
-      {
-         align_preprocessor();
-      }
-      // Indent the text
-      indent_preproc();
-      indent_text();
-
-      // Insert trailing comments after certain close braces
+   // Insert trailing comments after certain close braces
+   if (  (options::mod_add_long_switch_closebrace_comment() > 0)
+      || (options::mod_add_long_function_closebrace_comment() > 0)
+      || (options::mod_add_long_class_closebrace_comment() > 0)
+      || (options::mod_add_long_namespace_closebrace_comment() > 0))
+   {
       log_rule_B("mod_add_long_switch_closebrace_comment");
       log_rule_B("mod_add_long_function_closebrace_comment");
       log_rule_B("mod_add_long_class_closebrace_comment");
       log_rule_B("mod_add_long_namespace_closebrace_comment");
+      add_long_closebrace_comment();
+   }
 
-      if (  (options::mod_add_long_switch_closebrace_comment() > 0)
-         || (options::mod_add_long_function_closebrace_comment() > 0)
-         || (options::mod_add_long_class_closebrace_comment() > 0)
-         || (options::mod_add_long_namespace_closebrace_comment() > 0))
-      {
-         add_long_closebrace_comment();
-      }
-      // Insert trailing comments after certain preprocessor conditional blocks
+   // Insert trailing comments after certain preprocessor conditional blocks
+   if (  (options::mod_add_long_ifdef_else_comment() > 0)
+      || (options::mod_add_long_ifdef_endif_comment() > 0))
+   {
       log_rule_B("mod_add_long_ifdef_else_comment");
       log_rule_B("mod_add_long_ifdef_endif_comment");
+      add_long_preprocessor_conditional_block_comment();
+   }
+   // Align everything else, reindent and break at code_width
+   first = true;
 
-      if (  (options::mod_add_long_ifdef_else_comment() > 0)
-         || (options::mod_add_long_ifdef_endif_comment() > 0))
-      {
-         add_long_preprocessor_conditional_block_comment();
-      }
-      // Align everything else, reindent and break at code_width
-      first = true;
+   dump_step(dump_file, "Before second while loop");
 
-      dump_step(dump_file, "Before second while loop");
+   do
+   {
+      align_all();
+      indent_text();
+      old_changes = cpd.changes;
 
-      do
+      if (options::code_width() > 0)
       {
-         align_all();
-         indent_text();
-         old_changes = cpd.changes;
-
          log_rule_B("code_width");
+         LOG_FMT(LNEWLINE, "%s(%d): Code_width loop start: %d\n",
+                 __func__, __LINE__, cpd.changes);
 
-         if (options::code_width() > 0)
+         if (options::debug_max_number_of_loops() > 0)
          {
-            LOG_FMT(LNEWLINE, "%s(%d): Code_width loop start: %d\n",
-                    __func__, __LINE__, cpd.changes);
             log_rule_B("debug_max_number_of_loops");
 
-            if (options::debug_max_number_of_loops() > 0)
+            if (cpd.changes > options::debug_max_number_of_loops())                 // Issue #2432
             {
-               if (cpd.changes > options::debug_max_number_of_loops())                 // Issue #2432
-               {
-                  LOG_FMT(LNEWLINE, "%s(%d): too many loops. Make a report, please.\n",
-                          __func__, __LINE__);
-                  log_flush(true);
-                  exit(EX_SOFTWARE);
-               }
+               LOG_FMT(LNEWLINE, "%s(%d): too many loops. Make a report, please.\n",
+                       __func__, __LINE__);
+               log_flush(true);
+               exit(EX_SOFTWARE);
             }
-            do_code_width();
+         }
+         do_code_width();
 
-            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;
-            }
+         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;
          }
-         dump_step(dump_file, "Inside second while loop");
-      } while (old_changes != cpd.changes);
+      }
+      dump_step(dump_file, "Inside second while loop");
+   } while (old_changes != cpd.changes);
 
-      // And finally, align the backslash newline stuff
-      align_right_comments();
+   // And finally, align the backslash newline stuff
+   align_right_comments();
 
+   if (options::align_nl_cont())
+   {
       log_rule_B("align_nl_cont");
+      align_backslash_newline();
+   }
+   dump_step(dump_file, "Final version");
 
-      if (options::align_nl_cont())
-      {
-         align_backslash_newline();
-      }
-      dump_step(dump_file, "Final version");
+   // which output is to be done?
+   if (cpd.html_file == nullptr)
+   {
+      // Now render it all to the output file
+      output_text(pfout);
+   }
+   else
+   {
+      make_folders(cpd.html_file);                    // Issue #4066
+      // create the tracking file
+      FILE *t_file;
+      t_file = fopen(cpd.html_file, "wb");
 
-      // which output is to be done?
-      if (cpd.html_file == nullptr)
+      if (t_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");
-
-         if (t_file)
-         {
-            output_text(t_file);
-            fclose(t_file);
-            exit(EX_OK);
-         }
-         exit(EX_USAGE);
+         LOG_FMT(LERR, "%s: Unable to create %s: %s (%d)\n",
+                 __func__, cpd.html_file, strerror(errno), errno);
+         exit(EX_IOERR);
       }
+      output_text(t_file);
+      fclose(t_file);
+      exit(EX_OK);
    }
 
    // Special hook for dumping parsed data for debugging
@@ -2467,7 +2466,7 @@ void uncrustify_file(const file_mem &fm, FILE *pfout, const char *parsed_file,
    }
 
    if (  cpd.do_check
-      && !bout_content_matches(fm, true))
+      && !bout_content_matches(fm, true, is_quiet))
    {
       cpd.check_fail_cnt++;
    }
@@ -2536,222 +2535,3 @@ E_Token find_token_name(const char *text)
    }
    return(CT_NONE);
 }
-
-
-static bool ends_with(const char *filename, const char *tag, bool case_sensitive = true)
-{
-   int len1 = strlen(filename);
-   int len2 = strlen(tag);
-
-   return(  len2 <= len1
-         && (  (  case_sensitive
-               && (strcmp(&filename[len1 - len2], tag) == 0))
-            || (  !case_sensitive
-               && (strcasecmp(&filename[len1 - len2], tag) == 0))));
-}
-
-
-struct lang_name_t
-{
-   const char *name;
-   size_t     lang;
-};
-
-static lang_name_t language_names[] =
-{
-   { "C",        LANG_C                       },      // 0x0001
-   { "CPP",      LANG_CPP                     },      // 0x0002
-   { "D",        LANG_D                       },      // 0x0004
-   { "CS",       LANG_CS                      },      // 0x0008
-   { "JAVA",     LANG_JAVA                    },      // 0x0010
-   { "OC",       LANG_OC                      },      // 0x0020
-   { "VALA",     LANG_VALA                    },      // 0x0040
-   { "PAWN",     LANG_PAWN                    },      // 0x0080
-   { "ECMA",     LANG_ECMA                    },      // 0x0100
-   { "OC+",      LANG_OC | LANG_CPP           },      // 0x0020 + 0x0002
-   { "CS+",      LANG_CS | LANG_CPP           },      // 0x0008 + 0x0002
-   { "C-Header", LANG_C | LANG_CPP | FLAG_HDR },      // 0x0001 + 0x0002 + 0x2000 = 0x2022
-};
-
-
-static size_t language_flags_from_name(const char *name)
-{
-   for (const auto &language : language_names)
-   {
-      if (strcasecmp(name, language.name) == 0)
-      {
-         return(language.lang);
-      }
-   }
-
-   return(0);
-}
-
-
-const char *language_name_from_flags(size_t lang)
-{
-   // Check for an exact match first
-   for (auto &language_name : language_names)
-   {
-      if (language_name.lang == lang)
-      {
-         return(language_name.name);
-      }
-   }
-
-   // Check for the first set language bit
-   for (auto &language_name : language_names)
-   {
-      if ((language_name.lang & lang) != 0)
-      {
-         return(language_name.name);
-      }
-   }
-
-   return("???");
-}
-
-
-//! type to map a programming language to a typically used filename extension
-struct lang_ext_t
-{
-   const char *ext;  //! filename extension typically used for ...
-   const char *name; //! a programming language
-};
-
-//! known filename extensions linked to the corresponding programming language
-struct lang_ext_t language_exts[] =
-{
-   { ".c",    "C"        },
-   { ".c++",  "CPP"      },
-   { ".cc",   "CPP"      },
-   { ".cp",   "CPP"      },
-   { ".cpp",  "CPP"      },
-   { ".cs",   "CS"       },
-   { ".cxx",  "CPP"      },
-   { ".d",    "D"        },
-   { ".di",   "D"        },
-   { ".es",   "ECMA"     },
-   { ".h",    "C-Header" },
-   { ".h++",  "CPP"      },
-   { ".hh",   "CPP"      },
-   { ".hp",   "CPP"      },
-   { ".hpp",  "CPP"      },
-   { ".hxx",  "CPP"      },
-   { ".inl",  "PAWN"     },
-   { ".java", "JAVA"     },
-   { ".js",   "ECMA"     },
-   { ".m",    "OC"       },
-   { ".mm",   "OC+"      },
-   { ".p",    "PAWN"     },
-   { ".pawn", "PAWN"     },
-   { ".sma",  "PAWN"     },
-   { ".sqc",  "C"        },  // embedded SQL
-   { ".sql",  "SQL"      },
-   { ".vala", "VALA"     },
-};
-
-
-const char *get_file_extension(int &idx)
-{
-   const char *val = nullptr;
-
-   if (idx < static_cast<int> ARRAY_SIZE(language_exts))
-   {
-      val = language_exts[idx].ext;
-   }
-   idx++;
-   return(val);
-}
-
-
-typedef std::map<string, string> extension_map_t;
-/**
- * maps a file extension to a language flag.
- *
- * @note The "." need to be included, as in ".c". The file extensions
- *       ARE case sensitive.
- */
-static extension_map_t g_ext_map;
-
-
-const char *extension_add(const char *ext_text, const char *lang_text)
-{
-   size_t lang_flags = language_flags_from_name(lang_text);
-
-   if (lang_flags)
-   {
-      const char *lang_name = language_name_from_flags(lang_flags);
-      g_ext_map[string(ext_text)] = lang_name;
-      return(lang_name);
-   }
-   return(nullptr);
-}
-
-
-void print_extensions(FILE *pfile)
-{
-   for (auto &language : language_names)
-   {
-      bool did_one = false;
-
-      for (auto &extension_val : g_ext_map)
-      {
-         if (strcmp(extension_val.second.c_str(), language.name) == 0)
-         {
-            if (!did_one)
-            {
-               fprintf(pfile, "file_ext %s", extension_val.second.c_str());
-               did_one = true;
-            }
-            fprintf(pfile, " %s", extension_val.first.c_str());
-         }
-      }
-
-      if (did_one)
-      {
-         fprintf(pfile, "\n");
-      }
-   }
-}
-
-
-// TODO: better use enum lang_t for source file language
-static size_t language_flags_from_filename(const char *filename)
-{
-   // check custom extensions first
-   for (const auto &extension_val : g_ext_map)
-   {
-      if (ends_with(filename, extension_val.first.c_str()))
-      {
-         return(language_flags_from_name(extension_val.second.c_str()));
-      }
-   }
-
-   for (auto &language : language_exts)
-   {
-      if (ends_with(filename, language.ext))
-      {
-         return(language_flags_from_name(language.name));
-      }
-   }
-
-   // check again without case sensitivity
-   for (auto &extension_val : g_ext_map)
-   {
-      if (ends_with(filename, extension_val.first.c_str(), false))
-      {
-         return(language_flags_from_name(extension_val.second.c_str()));
-      }
-   }
-
-   for (auto &language : language_exts)
-   {
-      if (ends_with(filename, language.ext, false))
-      {
-         return(language_flags_from_name(language.name));
-      }
-   }
-
-   return(LANG_C);
-} // language_flags_from_filename
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/uncrustify.h
index 0a584805..3b839060 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/uncrustify.h
@@ -1,6 +1,6 @@
 /**
  * @file uncrustify.h
- * prototypes for uncrustify.c
+ * prototypes for uncrustify.cpp
  *
  * @author  Ben Gardner
  * @license GPL v2+
@@ -16,7 +16,7 @@
 int load_header_files();
 
 
-void uncrustify_file(const file_mem &fm, FILE *pfout, const char *parsed_file, const char *dump_filename, bool defer_uncrustify_end = false);
+void uncrustify_file(const file_mem &fm, FILE *pfout, const char *parsed_file, const char *dump_filename, bool is_quiet, bool defer_uncrustify_end = false);
 
 
 void uncrustify_end();
@@ -26,16 +26,6 @@ const char *get_token_name(E_Token token);
 
 
 /**
- * Gets the tag text for a language
- *
- * @param lang  The LANG_xxx enum
- *
- * @return A string
- */
-const char *language_name_from_flags(size_t lang);
-
-
-/**
  * Grab the token id for the text.
  *
  * @return token, will be CT_NONE on failure to match
@@ -76,19 +66,4 @@ void usage(const char *argv0);
 
 void usage_error(const char *msg = nullptr);
 
-
-/**
- * Set idx = 0 before the first call.
- * Done when returns nullptr
- */
-const char *get_file_extension(int &idx);
-
-
-//! Prints custom file extensions to the file
-void print_extensions(FILE *pfile);
-
-
-const char *extension_add(const char *ext_text, const char *lang_text);
-
-
 #endif /* UNCRUSTIFY_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify_emscripten.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/uncrustify_emscripten.cpp
index 72206627..790e7ece 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify_emscripten.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/uncrustify_emscripten.cpp
@@ -809,6 +809,7 @@ EMSCRIPTEN_BINDINGS(MainModule)
       .value("COMMENT_START", E_Token::CT_COMMENT_START)
       .value("COMMENT_END", E_Token::CT_COMMENT_END)
       .value("COMMENT_WHOLE", E_Token::CT_COMMENT_WHOLE)
+      .value("COMMENT_CPP_ENDIF", E_Token::CT_COMMENT_CPP_ENDIF)
       .value("COMMENT_ENDIF", E_Token::CT_COMMENT_ENDIF)
       .value("IGNORED", E_Token::CT_IGNORED)
       .value("WORD", E_Token::CT_WORD)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify_limits.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/uncrustify_limits.h
index 9f226870..9f226870 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify_limits.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/uncrustify_limits.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify_types.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/uncrustify_types.cpp
index bd57f2d5..4dc959c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify_types.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/uncrustify_types.cpp
@@ -9,50 +9,70 @@
 #include "uncrustify_types.h"
 
 
-const char *get_brace_stage_name(brace_stage_e brace_stage)
+const char *get_brace_stage_name(E_BraceStage brace_stage)
 {
    switch (brace_stage)
    {
-   case brace_stage_e::NONE:
+   case E_BraceStage::NONE:
       return("NONE");
 
-   case brace_stage_e::PAREN1:
+   case E_BraceStage::PAREN1:
       return("PAREN1");
 
-   case brace_stage_e::OP_PAREN1:
+   case E_BraceStage::OP_PAREN1:
       return("OP_PAREN1");
 
-   case brace_stage_e::WOD_PAREN:
+   case E_BraceStage::WOD_PAREN:
       return("WOD_PAREN");
 
-   case brace_stage_e::WOD_SEMI:
+   case E_BraceStage::WOD_SEMI:
       return("WOD_SEMI");
 
-   case brace_stage_e::BRACE_DO:
+   case E_BraceStage::BRACE_DO:
       return("BRACE_DO");
 
-   case brace_stage_e::BRACE2:
+   case E_BraceStage::BRACE2:
       return("BRACE2");
 
-   case brace_stage_e::ELSE:
+   case E_BraceStage::ELSE:
       return("ELSE");
 
-   case brace_stage_e::ELSEIF:
+   case E_BraceStage::ELSEIF:
       return("ELSEIF");
 
-   case brace_stage_e::WHILE:
+   case E_BraceStage::WHILE:
       return("WHILE");
 
-   case brace_stage_e::CATCH:
+   case E_BraceStage::CATCH:
       return("CATCH");
 
-   case brace_stage_e::CATCH_WHEN:
+   case E_BraceStage::CATCH_WHEN:
       return("CATCH_WHEN");
    }
    return("?????");
 } // get_brace_stage_name
 
 
+const char *get_tracking_type_e_name(tracking_type_e type)
+{
+   switch (type)
+   {
+   case tracking_type_e::TT_NONE:
+      return("NONE");
+
+   case tracking_type_e::TT_SPACE:
+      return("space");
+
+   case tracking_type_e::TT_NEWLINE:
+      return("newline");
+
+   case tracking_type_e::TT_START:
+      return("start");
+   }
+   return("?????");
+} // get_tracking_type_e_name
+
+
 const char *get_unc_stage_name(unc_stage_e unc_stage)
 {
    switch (unc_stage)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify_types.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/uncrustify_types.h
index 402c7922..0e2a0786 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify_types.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/uncrustify_types.h
@@ -17,16 +17,13 @@
 #include "uncrustify_limits.h"
 
 #include <assert.h>
-#include <cstddef>      // do get the definition of size_t
+#include <cstddef>      // to get size_t
 
 #ifdef HAVE_UTIME_H
 #include <utime.h>
 #endif
 
 
-class ParseFrame;
-
-
 /**
  * abbreviations used:
  *   SS = star style
@@ -49,7 +46,7 @@ class ParseFrame;
 
 
 //! Brace stage enum used in brace_cleanup
-enum class brace_stage_e : unsigned int
+enum class E_BraceStage : unsigned int
 {
    NONE,
    PAREN1,      //! expected paren after if/catch (C++)/for/switch/synchronized/while
@@ -79,9 +76,11 @@ enum class tracking_type_e : unsigned int
 {
    TT_NONE,
    TT_SPACE,
-   TT_NEWLINE
+   TT_NEWLINE,
+   TT_START
 };
 
+const char *get_tracking_type_e_name(tracking_type_e type);
 
 class Chunk; //forward declaration
 
@@ -91,16 +90,16 @@ class Chunk; //forward declaration
  * indent of another chunk. This is needed, as that chunk may be aligned and
  * so the indent cannot be determined in the indent code.
  */
-struct T_IndentData
+struct IndentationData
 {
    Chunk *ref;
    int   delta;
 };
 
 
-struct T_AlignData
+struct AlignmentData
 {
-   Chunk  *next;       //! nullptr or the chunk that should be under this one
+   Chunk  *next;       //! Chunk::NullChunkPtr or the chunk that should be under this one
    bool   right_align; //! AlignStack.m_right_align
    size_t star_style;  //! AlignStack.m_star_style
    size_t amp_style;   //! AlignStack.m_amp_style
@@ -118,30 +117,30 @@ struct T_AlignData
 
 
 // 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
-
-//! list of all programming languages Uncrustify supports
-enum lang_flag_e
-{
-   LANG_C    = 0x0001,
-   LANG_CPP  = 0x0002,
-   LANG_D    = 0x0004,
-   LANG_CS   = 0x0008,     //! C# (C-Sharp)
-   LANG_JAVA = 0x0010,
-   LANG_OC   = 0x0020,     //! Objective-C
-   LANG_VALA = 0x0040,
-   LANG_PAWN = 0x0080,
-   LANG_ECMA = 0x0100,     //! ECMA Script (JavaScript)
-
-   LANG_ALLC = 0x017f,     /** LANG_C    | LANG_CPP | LANG_D    | LANG_CS   |
-                            *  LANG_JAVA | LANG_OC  | LANG_VALA | LANG_ECMA   */
-   LANG_ALL  = 0x0fff,     //! applies to all languages
-
-   FLAG_HDR  = 0x2000,     /*<< Header file for C family languages */
-   FLAG_DIG  = 0x4000,     //! digraph/trigraph
-   FLAG_PP   = 0x8000,     //! only appears in a preprocessor
-};
+typedef std::pair<size_t, char *>   TrackNumber;   // track for "trackNumber" and "rule"
+typedef std::vector<TrackNumber>    TrackList;     // list of tracks
+
+////! list of all programming languages Uncrustify supports
+//enum lang_flag_e
+//{
+//   LANG_C    = 0x0001,
+//   LANG_CPP  = 0x0002,
+//   LANG_D    = 0x0004,
+//   LANG_CS   = 0x0008,     //! C# (C-Sharp)
+//   LANG_JAVA = 0x0010,
+//   LANG_OC   = 0x0020,     //! Objective-C
+//   LANG_VALA = 0x0040,
+//   LANG_PAWN = 0x0080,
+//   LANG_ECMA = 0x0100,     //! ECMA Script (JavaScript)
+//
+//   LANG_ALLC = 0x017f,     /** LANG_C    | LANG_CPP | LANG_D    | LANG_CS   |
+//                            *  LANG_JAVA | LANG_OC  | LANG_VALA | LANG_ECMA   */
+//   LANG_ALL  = 0x0fff,     //! applies to all languages
+//
+//   FLAG_HDR  = 0x2000,     /*<< Header file for C family languages */
+//   FLAG_DIG  = 0x4000,     //! digraph/trigraph
+//   FLAG_PP   = 0x8000,     //! only appears in a preprocessor
+//};
 
 //! Pattern classes for special keywords
 enum class pattern_class_e : unsigned int
@@ -242,7 +241,7 @@ struct cp_data_t
 
    // stuff to auto-detect line endings
    UINT32            le_counts[uncrustify::line_end_styles];
-   unc_text          newline;
+   UncText           newline;
 
    bool              did_newline;       //! flag indicates if a newline was added or converted
    E_Token           in_preproc;
@@ -274,7 +273,7 @@ struct cp_data_t
 
 extern cp_data_t cpd;  // TODO: can we avoid this external variable?
 
-const char *get_brace_stage_name(brace_stage_e brace_stage);
+const char *get_brace_stage_name(E_BraceStage brace_stage);
 
 const char *get_unc_stage_name(unc_stage_e unc_stage);
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify_version.h.in b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/uncrustify_version.h.in
index 079e0fa6..079e0fa6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/uncrustify_version.h.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/uncrustify_version.h.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unicode.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/unicode.cpp
index 0acd4ddb..684f5b0a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unicode.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/unicode.cpp
@@ -571,7 +571,7 @@ void write_char(int ch)
 }
 
 
-void write_string(const unc_text &text)
+void write_string(const UncText &text)
 {
    for (size_t idx = 0; idx < text.size(); idx++)
    {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unicode.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/unicode.h
index 7217778b..28318f91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/unicode.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/unicode.h
@@ -1,6 +1,6 @@
 /**
  * @file unicode.h
- * prototypes for unicode.c
+ * prototypes for unicode.cpp
  *
  * @author  Ben Gardner
  * @license GPL v2+
@@ -21,7 +21,7 @@ void write_bom();
 void write_char(int ch);
 
 
-void write_string(const unc_text &text);
+void write_string(const UncText &text);
 
 
 //! Figure out the encoding and convert to an int sequence
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/universalindentgui.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/universalindentgui.cpp
index 12c66b5c..23b2912a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/universalindentgui.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/universalindentgui.cpp
@@ -46,7 +46,7 @@ void print_option_choices(FILE *pfile, uncrustify::GenericOption *option,
 
    for (auto c = option->possibleValues(); *c; ++c)
    {
-      fprintf(pfile, "%s=%s%c", option->name(), *c, c[1] ? '|' : '\n');
+      fprintf(pfile, "%s\\s*=\\s*%s%c", option->name(), *c, c[1] ? '|' : '\n');
    }
 }
 
@@ -152,7 +152,8 @@ void print_universal_indent_cfg(FILE *pfile)
            "parameterOrder=ipo\n"
            "showHelpParameter=-h\n"
            "stringparaminquotes=false\n"
-           "useCfgFileParameter=\"-c \"\n");
+           "useCfgFileParameter=\"-c \"\n"
+           "useRegex=true\n");
 
    fprintf(pfile, "version=%s\n", UNCRUSTIFY_VERSION);
 
@@ -188,7 +189,11 @@ void print_universal_indent_cfg(FILE *pfile)
             }
          }
 
+#if defined (DEBUG) && !defined (WIN32)
+         fprintf(pfile, "\n[(%zu)%s]\n", optionNumber, optionNameReadable);
+#else // DEBUG
          fprintf(pfile, "\n[%s]\n", optionNameReadable);
+#endif // DEBUG
          fprintf(pfile, "Category=%zu\n", idx);
 #if defined (DEBUG) && !defined (WIN32)
          fprintf(pfile, "Description=\"<html>(%zu)", optionNumber);
@@ -245,7 +250,7 @@ void print_universal_indent_cfg(FILE *pfile)
             // only a number. Also it is by default enabled.
             fprintf(pfile, "Enabled=true\n");
             fprintf(pfile, "EditorType=multiple\n");
-            fprintf(pfile, "Choices=\"%s=0|%s=1|%s=2\"\n",
+            fprintf(pfile, "Choices=\"%s\\s*=\\s*0|%s\\s*=\\s*1|%s\\s*=\\s*2\"\n",
                     option->name(), option->name(), option->name());
 #if defined (DEBUG) && !defined (WIN32)
             fprintf(pfile, "ChoicesReadable=\"(%zu)Spaces only|(%zu)Indent with tabs, align with spaces|(%zu)Indent and align with tabs\"\n",
@@ -288,7 +293,7 @@ void print_universal_indent_cfg(FILE *pfile)
 
             case uncrustify::OT_NUM:
                fprintf(pfile, "EditorType=numeric\n");
-               fprintf(pfile, "CallName=\"%s=\"\n", option->name());
+               fprintf(pfile, "CallName=\"%s\\s*=\\s*\"\n", option->name());
                fprintf(pfile, "MinVal=%s\n", option->minStr().c_str());
                fprintf(pfile, "MaxVal=%s\n", option->maxStr().c_str());
                fprintf(pfile, "ValueDefault=%s\n", option->str().c_str());
@@ -296,7 +301,7 @@ void print_universal_indent_cfg(FILE *pfile)
 
             case uncrustify::OT_UNUM:
                fprintf(pfile, "EditorType=numeric\n");
-               fprintf(pfile, "CallName=\"%s=\"\n", option->name());
+               fprintf(pfile, "CallName=\"%s\\s*=\\s*\"\n", option->name());
                fprintf(pfile, "MinVal=%s\n", option->minStr().c_str());
                fprintf(pfile, "MaxVal=%s\n", option->maxStr().c_str());
                fprintf(pfile, "ValueDefault=%s\n", option->str().c_str());
@@ -349,7 +354,7 @@ void print_universal_indent_cfg(FILE *pfile)
 
             case uncrustify::OT_STRING:
             {
-               fprintf(pfile, "CallName=%s=\n", option->name());
+               fprintf(pfile, "CallName=%s\\s*=\\s*\n", option->name());
                fprintf(pfile, "EditorType=string\n");
                fprintf(pfile, "ValueDefault=%s\n", option->str().c_str());
                break;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/universalindentgui.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/universalindentgui.h
index 35a65167..79a41bf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/universalindentgui.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/universalindentgui.h
@@ -1,6 +1,6 @@
 /**
  * @file universalindentgui.h
- * prototypes for universalindentgui.c
+ * prototypes for universalindentgui.cpp
  *
  * @author  Ben Gardner
  * @license GPL v2+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/width.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/width.cpp
index 7734c90e..4dcc0249 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/width.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/width.cpp
@@ -23,14 +23,18 @@ using namespace uncrustify;
  * - fparen = function parenthesis
  */
 
-struct cw_entry
+struct SplitEntry
 {
    Chunk  *pc;
    size_t pri;
+
+   SplitEntry()
+      : pc(Chunk::NullChunkPtr)
+      , pri(0) {}
 };
 
 
-struct token_pri
+struct TokenPriority
 {
    E_Token tok;
    size_t  pri;
@@ -63,7 +67,7 @@ static size_t get_split_pri(E_Token tok);
  *  - ? :
  *  - function open paren not followed by close paren
  */
-static void try_split_here(cw_entry &ent, Chunk *pc);
+static void try_split_here(SplitEntry &ent, Chunk *pc);
 
 
 /**
@@ -79,26 +83,6 @@ static bool split_line(Chunk *pc);
 
 
 /**
- * Figures out where to split a function def/proto/call
- *
- * For function prototypes and definition. Also function calls where
- * level == m_braceLevel:
- *   - find the open function parenthesis
- *     + if it doesn't have a newline right after it
- *       * see if all parameters will fit individually after the paren
- *       * if not, throw a newline after the open paren & return
- *   - scan backwards to the open fparen or comma
- *     + if there isn't a newline after that item, add one & return
- *     + otherwise, add a newline before the start token
- *
- * @param start   the offending token
- * @return        the token that should have a newline
- *                inserted before it
- */
-static void split_fcn_params(Chunk *start);
-
-
-/**
  * Figures out where to split a template
  *
  *
@@ -129,10 +113,11 @@ static void split_for_stmt(Chunk *start);
 static inline bool is_past_width(Chunk *pc)
 {
    // allow char to sit at last column by subtracting 1
-   LOG_FMT(LSPLIT, "%s(%d): orig line is %zu, orig col is %zu, for %s\n",
-           __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text());
-   log_rule_B("code_width");
-   return((pc->GetColumn() + pc->Len() - 1) > options::code_width());
+   size_t currCol = pc->GetColumn() + pc->Len() - 1;
+
+   LOG_FMT(LSPLIT, "%s(%d): orig line %zu, orig col %zu, curr col %zu, text %s\n",
+           __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), currCol, pc->Text());
+   return(currCol > options::code_width());
 }
 
 
@@ -141,10 +126,37 @@ static void split_before_chunk(Chunk *pc)
    LOG_FUNC_ENTRY();
    LOG_FMT(LSPLIT, "%s(%d): Text() '%s'\n", __func__, __LINE__, pc->Text());
 
+   Chunk *prev = pc->GetPrev();
+
    if (  !pc->IsNewline()
-      && !pc->GetPrev()->IsNewline())
+      && !prev->IsNewline())
    {
       newline_add_before(pc);
+      // Mark chunk as continuation line, so indentation can be
+      // correctly set over multiple passes
+      pc->SetFlagBits(PCF_CONT_LINE);
+
+      // Mark open and close parens as continuation line chunks.
+      // This will prevent an additional level and frame to be
+      // added to the current frame stack (issue 3105).
+      if (  prev->Is(CT_PAREN_OPEN)
+         || prev->Is(CT_LPAREN_OPEN)
+         || prev->Is(CT_SPAREN_OPEN)
+         || prev->Is(CT_FPAREN_OPEN)
+         || prev->Is(CT_SQUARE_OPEN)
+         || prev->Is(CT_ANGLE_OPEN))
+      {
+         LOG_FMT(LSPLIT, "%s(%d): set PCF_LINE_CONT for prev text '%s', orig line is %zu, orig col is %zu\n",
+                 __func__, __LINE__, prev->Text(), prev->GetOrigLine(), prev->GetOrigCol());
+
+         prev->SetFlagBits(PCF_CONT_LINE);
+         Chunk *closing_paren = prev->GetClosingParen();
+
+         if (closing_paren->IsNotNullChunk())
+         {
+            closing_paren->SetFlagBits(PCF_CONT_LINE);
+         }
+      }
       // reindent needs to include the indent_continue value and was off by one
       log_rule_B("indent_columns");
       log_rule_B("indent_continue");
@@ -152,7 +164,31 @@ static void split_before_chunk(Chunk *pc)
                     abs(options::indent_continue()) + 1);
       cpd.changes++;
    }
-}
+} // split_before_chunk
+
+
+static TokenPriority pri_table[] =
+{
+   { CT_SEMICOLON,    1 },
+   { CT_COMMA,        2 },
+   { CT_BOOL,         3 },
+   { CT_COMPARE,      4 },
+   { CT_SHIFT,        5 },
+   { CT_ARITH,        6 },
+   { CT_CARET,        7 },
+   { CT_ASSIGN,       9 },
+   { CT_STRING,      10 },
+   { CT_FOR_COLON,   11 },
+   { CT_QUESTION,    20 }, // allow break in ? : for ls_code_width
+   { CT_COND_COLON,  20 },
+   { CT_FPAREN_OPEN, 21 }, // break after function open paren not followed by close paren
+   { CT_QUALIFIER,   25 },
+   { CT_CLASS,       25 },
+   { CT_STRUCT,      25 },
+   { CT_TYPE,        25 },
+   { CT_TYPENAME,    25 },
+   { CT_VOLATILE,    25 },
+};
 
 
 void do_code_width()
@@ -160,6 +196,20 @@ void do_code_width()
    LOG_FUNC_ENTRY();
    LOG_FMT(LSPLIT, "%s(%d)\n", __func__, __LINE__);
 
+   // If indent_continue is negative, we want to look for long lines splits,
+   // so raise CT_FPAREN_OPEN priority to get better results.
+   if (options::indent_continue() < 0)
+   {
+      for (TokenPriority &token : pri_table)
+      {
+         if (token.tok == CT_FPAREN_OPEN)
+         {
+            token.pri = 8; // Before assignment priority
+            break;
+         }
+      }
+   }
+
    for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
       if (  !pc->IsCommentOrNewline()
@@ -186,38 +236,12 @@ void do_code_width()
          }
       }
    }
-}
-
-
-static const token_pri pri_table[] =
-{
-   { CT_SEMICOLON,    1 },
-   { CT_COMMA,        2 },
-   { CT_BOOL,         3 },
-   { CT_COMPARE,      4 },
-   { CT_SHIFT,        5 },
-   { CT_ARITH,        6 },
-   { CT_CARET,        7 },
-   { CT_ASSIGN,       8 },
-   { CT_STRING,       9 },
-   { CT_FOR_COLON,   10 },
-   //{ CT_DC_MEMBER, 11 },
-   //{ CT_MEMBER,    11 },
-   { CT_QUESTION,    20 }, // allow break in ? : for ls_code_width
-   { CT_COND_COLON,  20 },
-   { CT_FPAREN_OPEN, 21 }, // break after function open paren not followed by close paren
-   { CT_QUALIFIER,   25 },
-   { CT_CLASS,       25 },
-   { CT_STRUCT,      25 },
-   { CT_TYPE,        25 },
-   { CT_TYPENAME,    25 },
-   { CT_VOLATILE,    25 },
-};
+} // do_code_width
 
 
 static size_t get_split_pri(E_Token tok)
 {
-   for (auto token : pri_table)
+   for (TokenPriority token : pri_table)
    {
       if (token.tok == tok)
       {
@@ -225,25 +249,23 @@ static size_t get_split_pri(E_Token tok)
       }
    }
 
-   return(0);
+   return(100); // Bigger than any valid priority
 }
 
 
-static void try_split_here(cw_entry &ent, Chunk *pc)
+static void try_split_here(SplitEntry &ent, Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   LOG_FMT(LSPLIT, "%s(%d): at %s, orig col=%zu\n", __func__, __LINE__, pc->Text(), pc->GetOrigCol());
    size_t pc_pri = get_split_pri(pc->GetType());
-
-   LOG_FMT(LSPLIT, "%s(%d): pc_pri is %zu\n", __func__, __LINE__, pc_pri);
+   LOG_FMT(LSPLIT, "%s(%d): text '%s', orig col %zu pc_pri %zu\n",
+           __func__, __LINE__, pc->Text(), pc->GetOrigCol(), pc_pri);
 
    if (pc_pri == 0)
    {
       LOG_FMT(LSPLIT, "%s(%d): pc_pri is 0, return\n", __func__, __LINE__);
       return;
    }
-   LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
    // Can't split after a newline
    Chunk *prev = pc->GetPrev();
 
@@ -253,12 +275,11 @@ static void try_split_here(cw_entry &ent, Chunk *pc)
    {
       if (prev->IsNotNullChunk())
       {
-         LOG_FMT(LSPLIT, "%s(%d): Can't split after a newline, orig line is %zu, return\n",
+         LOG_FMT(LSPLIT, "%s(%d): can't split after a newline, orig line is %zu, return\n",
                  __func__, __LINE__, prev->GetOrigLine());
       }
       return;
    }
-   LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
 
    // Can't split a function without arguments
    if (pc->Is(CT_FPAREN_OPEN))
@@ -267,11 +288,10 @@ static void try_split_here(cw_entry &ent, Chunk *pc)
 
       if (next->Is(CT_FPAREN_CLOSE))
       {
-         LOG_FMT(LSPLIT, "%s(%d): Can't split a function without arguments, return\n", __func__, __LINE__);
+         LOG_FMT(LSPLIT, "%s(%d): can't split a function without arguments, return\n", __func__, __LINE__);
          return;
       }
    }
-   LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
 
    // Only split concatenated strings
    if (pc->Is(CT_STRING))
@@ -280,22 +300,18 @@ static void try_split_here(cw_entry &ent, Chunk *pc)
 
       if (next->IsNot(CT_STRING))
       {
-         LOG_FMT(LSPLIT, "%s(%d): Only split concatenated strings, return\n", __func__, __LINE__);
+         LOG_FMT(LSPLIT, "%s(%d): only split concatenated strings, return\n", __func__, __LINE__);
          return;
       }
    }
-   LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
 
    // keep common groupings unless ls_code_width
-   log_rule_B("ls_code_width");
-
    if (  !options::ls_code_width()
-      && pc_pri >= 20)
+      && pc_pri >= 22)
    {
       LOG_FMT(LSPLIT, "%s(%d): keep common groupings unless ls_code_width, return\n", __func__, __LINE__);
       return;
    }
-   LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
 
    // don't break after last term of a qualified type
    if (pc_pri == 25)
@@ -309,29 +325,14 @@ static void try_split_here(cw_entry &ent, Chunk *pc)
          return;
       }
    }
-   LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
-   // Check levels first
-   bool change = false;
 
-   if (  ent.pc == nullptr
-      || pc->GetLevel() < ent.pc->GetLevel())
+   if (  ent.pc->IsNullChunk()
+      || pc_pri < ent.pri
+      || (  pc_pri == ent.pri
+         && pc->IsNot(CT_FPAREN_OPEN)
+         && pc->GetLevel() < ent.pc->GetLevel()))
    {
-      LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
-      change = true;
-   }
-   else
-   {
-      if (pc_pri < ent.pri)
-      {
-         LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
-         change = true;
-      }
-   }
-   LOG_FMT(LSPLIT, "%s(%d): change is %s\n", __func__, __LINE__, change ? "TRUE" : "FALSE");
-
-   if (change)
-   {
-      LOG_FMT(LSPLIT, "%s(%d): do the change\n", __func__, __LINE__);
+      LOG_FMT(LSPLIT, "%s(%d): found possible split\n", __func__, __LINE__);
       ent.pc  = pc;
       ent.pri = pc_pri;
    }
@@ -341,11 +342,11 @@ static void try_split_here(cw_entry &ent, Chunk *pc)
 static bool split_line(Chunk *start)
 {
    LOG_FUNC_ENTRY();
-   LOG_FMT(LSPLIT, "%s(%d): start->Text() '%s', orig line is %zu, orig col is %zu, type is %s\n",
+   LOG_FMT(LSPLIT, "%s(%d): start->Text() '%s', orig line %zu, orig col %zu, type %s\n",
            __func__, __LINE__, start->Text(), start->GetOrigLine(), start->GetOrigCol(), get_token_name(start->GetType()));
    LOG_FMT(LSPLIT, "   start->GetFlags() ");
    log_pcf_flags(LSPLIT, start->GetFlags());
-   LOG_FMT(LSPLIT, "   start->GetParentType() %s, (PCF_IN_FCN_DEF is %s), (PCF_IN_FCN_CALL is %s)\n",
+   LOG_FMT(LSPLIT, "   start->GetParentType() %s, (PCF_IN_FCN_DEF %s), (PCF_IN_FCN_CALL %s)\n",
            get_token_name(start->GetParentType()),
            start->TestFlags((PCF_IN_FCN_DEF)) ? "TRUE" : "FALSE",
            start->TestFlags((PCF_IN_FCN_CALL)) ? "TRUE" : "FALSE");
@@ -354,7 +355,7 @@ static bool split_line(Chunk *start)
    // Issue #2432
    if (start->TestFlags(PCF_ONE_LINER))
    {
-      LOG_FMT(LSPLIT, "%s(%d): ** ONCE LINER SPLIT **\n", __func__, __LINE__);
+      LOG_FMT(LSPLIT, "%s(%d): ** ONE LINER SPLIT **\n", __func__, __LINE__);
       undo_one_liner(start);
       newlines_cleanup_braces(false);
       // Issue #1352
@@ -363,10 +364,9 @@ static bool split_line(Chunk *start)
    }
    LOG_FMT(LSPLIT, "%s(%d): before ls_code_width\n", __func__, __LINE__);
 
-   log_rule_B("ls_code_width");
-
    if (options::ls_code_width())
    {
+      log_rule_B("ls_code_width");
    }
    // Check to see if we are in a for statement
    else if (start->TestFlags(PCF_IN_FOR))
@@ -380,22 +380,20 @@ static bool split_line(Chunk *start)
       }
       LOG_FMT(LSPLIT, "%s(%d): for split didn't work\n", __func__, __LINE__);
    }
-
    /*
     * If this is in a function call or prototype, split on commas or right
     * after the open parenthesis
     */
    else if (  start->TestFlags(PCF_IN_FCN_DEF)
-           || start->GetParentType() == CT_FUNC_PROTO            // Issue #1169
-           || (  (start->GetLevel() == (start->GetBraceLevel() + 1))
-              && start->TestFlags(PCF_IN_FCN_CALL)))
+           || start->TestFlags(PCF_IN_FCN_CALL)
+           || start->GetParentType() == CT_FUNC_PROTO)            // Issue #1169
    {
       LOG_FMT(LSPLIT, " ** FUNC SPLIT **\n");
 
-      log_rule_B("ls_func_split_full");
-
       if (options::ls_func_split_full())
       {
+         log_rule_B("ls_func_split_full");
+
          split_fcn_params_full(start);
 
          if (!is_past_width(start))
@@ -403,8 +401,6 @@ static bool split_line(Chunk *start)
             return(true);
          }
       }
-      split_fcn_params(start);
-      return(true);
    }
 
    /*
@@ -418,17 +414,17 @@ static bool split_line(Chunk *start)
    }
    LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
    // Try to find the best spot to split the line
-   cw_entry ent;
+   SplitEntry ent;
+   ent.pc  = Chunk::NullChunkPtr;
+   ent.pri = CT_UNKNOWN;
 
-   memset(&ent, 0, sizeof(ent));
-   Chunk *pc = start;
+   Chunk *pc = start->GetPrev();
    Chunk *prev;
 
-   while (  ((pc = pc->GetPrev()) != nullptr)
-         && pc->IsNotNullChunk()
+   while (  pc->IsNotNullChunk()
          && !pc->IsNewline())
    {
-      LOG_FMT(LSPLIT, "%s(%d): at %s, orig line is %zu, orig col is %zu\n",
+      LOG_FMT(LSPLIT, "%s(%d): text '%s', orig line is %zu, orig col is %zu\n",
               __func__, __LINE__, pc->Text(), pc->GetOrigLine(), pc->GetOrigCol());
 
       if (pc->IsNot(CT_SPACE))
@@ -436,17 +432,18 @@ static bool split_line(Chunk *start)
          try_split_here(ent, pc);
 
          // break at maximum line length
-         log_rule_B("ls_code_width");
-
-         if (  ent.pc != nullptr
-            && (options::ls_code_width()))
+         if (  ent.pc->IsNotNullChunk()
+            && options::ls_code_width())
          {
+            log_rule_B("ls_code_width");
+            LOG_FMT(LSPLIT, "%s(%d): found split\n", __func__, __LINE__);
             break;
          }
       }
+      pc = pc->GetPrev();
    }
 
-   if (ent.pc == nullptr)
+   if (ent.pc->IsNullChunk())
    {
       LOG_FMT(LSPLIT, "%s(%d):    TRY_SPLIT yielded NO SOLUTION for orig line %zu at '%s' [%s]\n",
               __func__, __LINE__, start->GetOrigLine(), start->Text(), get_token_name(start->GetType()));
@@ -460,9 +457,9 @@ static bool split_line(Chunk *start)
    }
 
    // Break before the token instead of after it according to the pos_xxx rules
-   if (ent.pc == nullptr)
+   if (ent.pc->IsNullChunk())
    {
-      pc = nullptr;
+      pc = Chunk::NullChunkPtr;
    }
    else
    {
@@ -498,8 +495,7 @@ static bool split_line(Chunk *start)
               __func__, __LINE__, pc->Text(), pc->GetOrigCol());
    }
 
-   if (  pc == nullptr
-      || pc->IsNullChunk())
+   if (pc->IsNullChunk())
    {
       pc = start;
 
@@ -558,7 +554,7 @@ static void split_for_stmt(Chunk *start)
    // how many semicolons (1 or 2) do we need to find
    log_rule_B("ls_for_split_full");
    size_t max_cnt     = options::ls_for_split_full() ? 2 : 1;
-   Chunk  *open_paren = nullptr;
+   Chunk  *open_paren = Chunk::NullChunkPtr;
    size_t nl_cnt      = 0;
 
    LOG_FMT(LSPLIT, "%s: starting on %s, line %zu\n",
@@ -581,7 +577,7 @@ static void split_for_stmt(Chunk *start)
       }
    }
 
-   if (open_paren == nullptr)
+   if (open_paren->IsNullChunk())
    {
       LOG_FMT(LSPLIT, "No open paren\n");
       return;
@@ -675,21 +671,22 @@ static void split_for_stmt(Chunk *start)
 static void split_fcn_params_full(Chunk *start)
 {
    LOG_FUNC_ENTRY();
-   LOG_FMT(LSPLIT, "%s(%d): %s\n", __func__, __LINE__, start->Text());
+   LOG_FMT(LSPLIT, "%s(%d): start at '%s'\n", __func__, __LINE__, start->Text());
 
    // Find the opening function parenthesis
    Chunk *fpo = start;
 
-   LOG_FMT(LSPLIT, "  %s(%d): Find the opening function parenthesis\n", __func__, __LINE__);
+   LOG_FMT(LSPLIT, "  %s(%d): search for opening function parenthesis\n", __func__, __LINE__);
 
    while ((fpo = fpo->GetPrev())->IsNotNullChunk())
    {
-      LOG_FMT(LSPLIT, "%s(%d): %s, orig col is %zu, level is %zu\n",
+      LOG_FMT(LSPLIT, "  %s(%d): %s, orig col is %zu, level is %zu\n",
               __func__, __LINE__, fpo->Text(), fpo->GetOrigCol(), fpo->GetLevel());
 
       if (  fpo->Is(CT_FPAREN_OPEN)
          && (fpo->GetLevel() == start->GetLevel() - 1))
       {
+         LOG_FMT(LSPLIT, "  %s(%d): found open paren\n", __func__, __LINE__);
          break;  // opening parenthesis found. Issue #1020
       }
    }
@@ -713,164 +710,6 @@ static void split_fcn_params_full(Chunk *start)
 }
 
 
-static void split_fcn_params(Chunk *start)
-{
-   LOG_FUNC_ENTRY();
-   LOG_FMT(LSPLIT, "%s(%d): start->Text() is '%s', orig line is %zu, orig col is %zu\n",
-           __func__, __LINE__, start->Text(), start->GetOrigLine(), start->GetOrigCol());
-   Chunk *fpo = start;
-
-   if (!start->Is(CT_FPAREN_OPEN))
-   {
-      // Find the opening function parenthesis
-      LOG_FMT(LSPLIT, "%s(%d): Find the opening function parenthesis\n", __func__, __LINE__);
-
-      while (  ((fpo = fpo->GetPrev()) != nullptr)
-            && fpo->IsNotNullChunk()
-            && fpo->IsNot(CT_FPAREN_OPEN))
-      {
-         // do nothing
-         LOG_FMT(LSPLIT, "%s(%d): '%s', orig col is %zu, level is %zu\n",
-                 __func__, __LINE__, fpo->Text(), fpo->GetOrigCol(), fpo->GetLevel());
-      }
-   }
-   Chunk  *pc     = fpo->GetNextNcNnl();
-   size_t min_col = pc->GetColumn();
-
-   log_rule_B("code_width");
-   LOG_FMT(LSPLIT, "    mincol is %zu, max_width is %zu\n",
-           min_col, options::code_width() - min_col);
-
-   int cur_width = 0;
-   int last_col  = -1;
-
-   LOG_FMT(LSPLIT, "%s(%d):look forward until CT_COMMA or CT_FPAREN_CLOSE\n", __func__, __LINE__);
-
-   while (pc->IsNotNullChunk())
-   {
-      LOG_CHUNK(LTOK, pc);
-
-      if (pc->IsNewline())
-      {
-         cur_width = 0;
-         last_col  = -1;
-      }
-      else
-      {
-         if (last_col < 0)
-         {
-            last_col = pc->GetColumn();
-            LOG_FMT(LSPLIT, "%s(%d): last_col is %d\n",
-                    __func__, __LINE__, last_col);
-         }
-         cur_width += (pc->GetColumn() - last_col) + pc->Len();
-         last_col   = pc->GetColumn() + pc->Len();
-
-         LOG_FMT(LSPLIT, "%s(%d): last_col is %d\n",
-                 __func__, __LINE__, last_col);
-
-         if (  pc->Is(CT_COMMA)
-            || pc->Is(CT_FPAREN_CLOSE))
-         {
-            if (cur_width == 0)
-            {
-               fprintf(stderr, "%s(%d): cur_width is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                       __func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
-               log_flush(true);
-               exit(EX_SOFTWARE);
-            }
-            cur_width--;
-            LOG_FMT(LSPLIT, "%s(%d): cur_width is %d\n",
-                    __func__, __LINE__, cur_width);
-
-            log_rule_B("code_width");
-
-            if (  ((last_col - 1) > static_cast<int>(options::code_width()))
-               || pc->Is(CT_FPAREN_CLOSE))
-            {
-               break;
-            }
-         }
-      }
-      pc = pc->GetNext();
-   }
-   // back up until the prev is a comma
-   Chunk *prev = pc;
-
-   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->GetLevel());
-
-   while ((prev = prev->GetPrev())->IsNotNullChunk())
-   {
-      LOG_FMT(LSPLIT, "%s(%d): prev->Text() is '%s', orig line is %zu, orig col is %zu\n",
-              __func__, __LINE__, prev->Text(), prev->GetOrigLine(), prev->GetOrigCol());
-      LOG_FMT(LSPLIT, "%s(%d): prev->GetLevel() is %zu, prev '%s', prev->GetType() is %s\n",
-              __func__, __LINE__, prev->GetLevel(), prev->Text(), get_token_name(prev->GetType()));
-
-      if (  prev->IsNewline()
-         || prev->Is(CT_COMMA))
-      {
-         LOG_FMT(LSPLIT, "%s(%d): found at %zu\n",
-                 __func__, __LINE__, prev->GetOrigCol());
-         break;
-      }
-      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);
-
-      if (prev->Is(CT_FPAREN_OPEN))
-      {
-         pc = prev->GetNext();
-
-         log_rule_B("indent_paren_nl");
-
-         if (!options::indent_paren_nl())
-         {
-            log_rule_B("indent_columns");
-            min_col = pc->GetBraceLevel() * options::indent_columns() + 1;
-            LOG_FMT(LSPLIT, "%s(%d): min_col is %zu\n",
-                    __func__, __LINE__, min_col);
-
-            log_rule_B("indent_continue");
-
-            if (options::indent_continue() == 0)
-            {
-               log_rule_B("indent_columns");
-               min_col += options::indent_columns();
-            }
-            else
-            {
-               min_col += abs(options::indent_continue());
-            }
-            LOG_FMT(LSPLIT, "%s(%d): min_col is %zu\n",
-                    __func__, __LINE__, min_col);
-         }
-
-         // Don't split "()"
-         if (pc->GetType() != E_Token(prev->GetType() + 1))
-         {
-            break;
-         }
-      }
-   }
-
-   if (  prev->IsNotNullChunk()
-      && !prev->IsNewline())
-   {
-      LOG_FMT(LSPLIT, "%s(%d): -- ended on %s --\n",
-              __func__, __LINE__, get_token_name(prev->GetType()));
-      LOG_FMT(LSPLIT, "%s(%d): min_col is %zu\n",
-              __func__, __LINE__, min_col);
-      pc = prev->GetNext();
-      newline_add_before(pc);
-      reindent_line(pc, min_col);
-      cpd.changes++;
-   }
-} // split_fcn_params
-
-
 static void split_template(Chunk *start)
 {
    LOG_FUNC_ENTRY();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/width.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/width.h
index 73df45e1..f418fb23 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/width.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/width.h
@@ -1,6 +1,6 @@
 /**
  * @file width.h
- * prototypes for width.c
+ * prototypes for width.cpp
  *
  * @author  Ben Gardner
  * @license GPL v2+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/windows_compat.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/windows_compat.h
index 619581b0..619581b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/src/windows_compat.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/src/windows_compat.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/.editorconfig b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/.editorconfig
index fcea945e..fcea945e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/.editorconfig
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/.editorconfig
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/BRACED_INIT_LIST_found_list.awk b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/BRACED_INIT_LIST_found_list.awk
index b1144618..b1144618 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/BRACED_INIT_LIST_found_list.awk
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/BRACED_INIT_LIST_found_list.awk
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/CMakeLists.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/CMakeLists.txt
index 13839df9..8ef75032 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/CMakeLists.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 find_package(Git QUIET)
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/c-sharp.test b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/c-sharp.test
index 4837a5ae..4837a5ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/c-sharp.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/c-sharp.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/c.test b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/c.test
index 05bbd247..987cf62e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/c.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/c.test
@@ -38,6 +38,7 @@
 00056  c/brace-remove-all.cfg                     c/brace-remove3.c
 00057  c/if_chain.cfg                             c/brace-remove3.c
 00058  c/brace-kr-nobr.cfg                        c/if_chain.c
+00059  c/Issue_2205.cfg                           c/Issue_2205.c
 
 00060  c/ben_050.cfg                              c/braces-2.c
 00061  c/ben_051.cfg                              c/braces-3.c
@@ -53,6 +54,7 @@
 00072  common/star_pos-0.cfg                      c/align-proto.c
 00073  common/empty.cfg                           c/nl_proto_endif.c
 00074  c/clang-has_include.cfg                    c/clang-has_include.h
+00075  common/tde.cfg                             c/function_prototypes_alignment.c
 00076  c/1225.cfg                                 c/1225.c
 
 00081  c/else-if-1.cfg                            c/else-if.c
@@ -84,6 +86,7 @@
 00130  c/ben_070.cfg                              c/minus-minus.c
 00131  c/Issue_3873.cfg                           c/Issue_3873.c
 00135  c/nepenthes.cfg                            c/br_cmt.c
+00136  common/empty.cfg                           c/Issue_4044.c
 
 00140  c/ben_071.cfg                              c/global-vars.c
 00141  c/ben_072.cfg                              c/deref.c
@@ -144,6 +147,11 @@
 00305  c/ben_081.cfg                              c/one-liner-define.c
 
 00310  common/empty.cfg                           c/sp_embed_comment.c
+00311  c/comment_conversion.cfg                   c/comment_conversion_define.c
+00312  c/comment_conversion.cfg                   c/comment_conversion_endif.c
+00313  c/comment_conversion.cfg                   c/comment_conversion_long_lines.c
+00314  c/comment_conversion.cfg                   c/comment_conversion_javadoc_single.c
+00315  common/tde.cfg                             c/comment_conversion_trailing_c_multiline.c
 
 00320  c/rdan.cfg                                 c/indent_first_bool_expr.c
 
@@ -169,7 +177,7 @@
 00417  c/align_sf_call_thresh_417.cfg             c/align_sf_call_thresh_417.c
 00418  c/align_sf_call_span_418.cfg               c/align_sf_call_span_418.c
 00419  c/align_sf_call_span_419.cfg               c/align_sf_call_span_419.c
-00420  c/Issue-2278.cfg                           c/Issue-2278.c
+00420  c/Issue_2278.cfg                           c/Issue_2278.c
 
 00421  c/nl_ds_struct_enum_cmt-t.cfg              c/nl_ds_struct_enum.c
 00422  c/nl_ds_struct_enum-2.cfg                  c/nl_ds_struct_enum.c
@@ -410,6 +418,9 @@
 02539  c/pp_multiline_define_align_pp_ml0.cfg     c/pp_multiline_define.c
 02540  c/pp_multiline_define_align_pp_ml-1.cfg    c/pp_multiline_define.c
 02541  c/pp_multiline_define_align_pp_ml-5.cfg    c/pp_multiline_define.c
+02542  c/align_nl_cont-2.cfg                      c/pp_multiline_define.c
+02543  c/align_nl_cont-3.cfg                      c/pp_multiline_define.c
+02544  c/align_nl_cont_spaces-5.cfg               c/pp_multiline_define.c
 
 02550  c/Issue_3852.cfg                           c/func_var_multi_paren.c
 
@@ -420,7 +431,7 @@
 09594  common/indent_columns-3.cfg                c/sf594.c
 09588  common/empty.cfg                           c/sf588.c
 
-09601  c/sp_after_sparen.cfg                      c/sp_after_sparen.c
+09601  common/bug_637.cfg                         c/bug_637.c
 09602  common/bug_671.cfg                         c/bug_671.c
 09603  common/indent_ternary_operator-1.cfg       c/indent_ternary-1.c
 09604  common/indent_ternary_operator-2.cfg       c/indent_ternary-2.c
@@ -548,3 +559,12 @@
 10111  c/mod_int-remove-left.cfg                  c/int-types.c
 10112  c/mod_int-remove-right.cfg                 c/int-types.c
 10113  c/mod_int-remove-all.cfg                   c/int-types.c
+10114  c/Issue_3989.cfg                           c/Issue_3989.c
+
+10120  c/sp_after_sparen-i.cfg                    c/sp_after_sparen.c
+10121  c/sp_after_sparen-a.cfg                    c/sp_after_sparen.c
+10122  c/sp_after_sparen-r.cfg                    c/sp_after_sparen.c
+10123  c/sp_after_sparen-f.cfg                    c/sp_after_sparen.c
+
+10124  common/tde.cfg                             c/Issue_3985.c
+10125  common/tde.cfg                             c/Issue_3992.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/I-842.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/config/I-842.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/I-842.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/config/I-842.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/copyright-header.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/config/copyright-header.cfg
index 13d5020b..13d5020b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/copyright-header.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/config/copyright-header.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/copyright-header.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/config/copyright-header.txt
index f96c1ae8..f96c1ae8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/copyright-header.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/config/copyright-header.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/mini_d.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/config/mini_d.cfg
index ddd51138..ddd51138 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/mini_d.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/config/mini_d.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/mini_nd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/config/mini_nd.cfg
index 1fe66176..1fe66176 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/mini_nd.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/config/mini_nd.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/replace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/config/replace.cfg
index 16473bf2..16473bf2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/replace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/config/replace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/tracking_space.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/config/tracking_space.cfg
index 8b37aa38..8b37aa38 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/tracking_space.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/config/tracking_space.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/truncate.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/config/truncate.cfg
index cc48c57e..cc48c57e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/truncate.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/config/truncate.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/unmatched_close_pp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/config/unmatched_close_pp.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/config/unmatched_close_pp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/config/unmatched_close_pp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/I-3310.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/I-3310.c
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/I-3310.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/I-3310.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/I-842.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/I-842.cpp
index 7f7bcaf3..7f7bcaf3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/I-842.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/I-842.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/backup.h-save b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/backup.h-save
index 9a66578c..9a66578c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/backup.h-save
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/backup.h-save
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/class_enum_struct_union.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/class_enum_struct_union.cpp
index 6a72c823..6a72c823 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/class_enum_struct_union.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/class_enum_struct_union.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/in_fcn_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/in_fcn_def.cpp
new file mode 100644
index 00000000..d0ba6b3c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/in_fcn_def.cpp
@@ -0,0 +1,5 @@
+void (*fnPtr)(int i, double d);
+void function(int i, double d);
+typedef	void (*fnPtr)(int i, double d);
+typedef	void function(int i, double d);
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/logger.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/logger.cs
index defede8a..defede8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/logger.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/logger.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/replace.list b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/replace.list
index 009e6f33..009e6f33 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/replace.list
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/replace.list
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/testSrc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/testSrc.cpp
index 1a22f6d9..1a22f6d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/testSrc.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/testSrc.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/testSrcP.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/testSrcP.cpp
index 85e36674..85e36674 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/testSrcP.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/testSrcP.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/tracking_space.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/tracking_space.cpp
index 5b0b8aa1..5b0b8aa1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/tracking_space.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/tracking_space.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/truncate.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/truncate.cpp
index 7ef9530d..7ef9530d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/truncate.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/truncate.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/unmatched_close_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/unmatched_close_pp.cpp
index b79d12fd..b79d12fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/input/unmatched_close_pp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/input/unmatched_close_pp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/21.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/21.txt
index 2df9b875..2df9b875 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/21.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/21.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/25.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/25.txt
index cf117b66..cf117b66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/25.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/25.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/28.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/28.txt
index c1283626..f08fdda1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/28.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/28.txt
@@ -70,302 +70,302 @@ 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() 'struct', type is STRUCT, PRE is false
 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, orig col is 1, type is STRUCT, tos is 0, TOS.type is EOF, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 0, expression count is 0
+parse_cleanup : frame statement count is 1, expression count is 1
 brace_cleanup : orig line is 1, orig col is 8, Text() 'TelegramIndex', type is TYPE, PRE is false
 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, orig col is 8, type is TYPE, tos is 0, TOS.type is EOF, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 1, expression count is 1
+parse_cleanup : frame statement count is 2, expression count is 2
 brace_cleanup : orig line is 1, orig col is 21, <Newline>, PRE is false
 brace_cleanup : pp level is 0
 brace_cleanup : orig line is 2, orig col is 1, Text() '{', type is BRACE_OPEN, PRE is false
 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, orig col is 1, type is BRACE_OPEN, tos is 0, TOS.type is EOF, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 2, expression count is 2
+parse_cleanup : frame statement count is 3, expression count is 3
+parse_cleanup : frame statement count is 0, expression count is 0
 brace_cleanup : orig line is 2, orig col is 2, <Newline>, PRE is false
 brace_cleanup : pp level is 0
 brace_cleanup : orig line is 3, orig col is 1, Text() 'TelegramIndex', type is WORD, PRE is false
 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, orig col is 1, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 0, expression count is 0
+parse_cleanup : frame statement count is 1, expression count is 1
 brace_cleanup : orig line is 3, orig col is 14, Text() '(', type is PAREN_OPEN, PRE is false
 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, orig col is 14, type is PAREN_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 1, expression count is 1
+parse_cleanup : frame statement count is 2, expression count is 2
 brace_cleanup : orig line is 3, orig col is 15, Text() 'const', type is QUALIFIER, PRE is false
 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, orig col is 15, type is QUALIFIER, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 2, expression count is 0
+parse_cleanup : frame statement count is 3, expression count is 1
 brace_cleanup : orig line is 3, orig col is 21, Text() 'char', type is TYPE, PRE is false
 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, orig col is 21, type is TYPE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 3, expression count is 1
+parse_cleanup : frame statement count is 4, expression count is 2
 brace_cleanup : orig line is 3, orig col is 25, Text() '*', type is PTR_TYPE, PRE is false
 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, orig col is 25, type is PTR_TYPE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 4, expression count is 2
+parse_cleanup : frame statement count is 5, expression count is 3
 brace_cleanup : orig line is 3, orig col is 27, Text() 'pN', type is WORD, PRE is false
 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, orig col is 27, type is WORD, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 5, expression count is 3
+parse_cleanup : frame statement count is 6, expression count is 4
 brace_cleanup : orig line is 3, orig col is 29, Text() ',', type is COMMA, PRE is false
 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, orig col is 29, type is COMMA, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 6, expression count is 4
+parse_cleanup : frame statement count is 7, expression count is 5
 brace_cleanup : orig line is 3, orig col is 31, Text() 'unsigned', type is TYPE, PRE is false
 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, orig col is 31, type is TYPE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 7, expression count is 0
+parse_cleanup : frame statement count is 8, expression count is 1
 brace_cleanup : orig line is 3, orig col is 40, Text() 'long', type is TYPE, PRE is false
 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, orig col is 40, type is TYPE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 8, expression count is 1
+parse_cleanup : frame statement count is 9, expression count is 2
 brace_cleanup : orig line is 3, orig col is 45, Text() 'nI', type is WORD, PRE is false
 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, orig col is 45, type is WORD, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 9, expression count is 2
+parse_cleanup : frame statement count is 10, expression count is 3
 brace_cleanup : orig line is 3, orig col is 47, Text() ')', type is PAREN_CLOSE, PRE is false
 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, orig col is 47, type is PAREN_CLOSE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 10, expression count is 3
+parse_cleanup : frame statement count is 11, expression count is 4
 brace_cleanup : orig line is 3, orig col is 49, Text() ':', type is COLON, PRE is false
 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, orig col is 49, type is COLON, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 11, expression count is 4
+parse_cleanup : frame statement count is 12, expression count is 5
+parse_cleanup : frame statement count is 0, expression count is 0
 brace_cleanup : orig line is 3, orig col is 50, <Newline>, PRE is false
 brace_cleanup : pp level is 0
 brace_cleanup : orig line is 4, orig col is 1, Text() 'pTelName', type is WORD, PRE is false
 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, orig col is 1, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 0, expression count is 0
+parse_cleanup : frame statement count is 1, expression count is 1
 brace_cleanup : orig line is 4, orig col is 9, Text() '(', type is PAREN_OPEN, PRE is false
 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, orig col is 9, type is PAREN_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 1, expression count is 1
+parse_cleanup : frame statement count is 2, expression count is 2
 brace_cleanup : orig line is 4, orig col is 10, Text() 'pN', type is WORD, PRE is false
 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, orig col is 10, type is WORD, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 2, expression count is 0
+parse_cleanup : frame statement count is 3, expression count is 1
 brace_cleanup : orig line is 4, orig col is 12, Text() ')', type is PAREN_CLOSE, PRE is false
 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, orig col is 12, type is PAREN_CLOSE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 3, expression count is 1
+parse_cleanup : frame statement count is 4, expression count is 2
 brace_cleanup : orig line is 4, orig col is 13, Text() ',', type is COMMA, PRE is false
 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, orig col is 13, type is COMMA, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 4, expression count is 2
+parse_cleanup : frame statement count is 5, expression count is 3
 brace_cleanup : orig line is 4, orig col is 14, <Newline>, PRE is false
 brace_cleanup : pp level is 0
 brace_cleanup : orig line is 5, orig col is 1, Text() 'nTelIndex', type is WORD, PRE is false
 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, orig col is 1, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 5, expression count is 0
+parse_cleanup : frame statement count is 6, expression count is 1
 brace_cleanup : orig line is 5, orig col is 10, Text() '(', type is PAREN_OPEN, PRE is false
 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, orig col is 10, type is PAREN_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 6, expression count is 1
+parse_cleanup : frame statement count is 7, expression count is 2
 brace_cleanup : orig line is 5, orig col is 11, Text() 'n', type is WORD, PRE is false
 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, orig col is 11, type is WORD, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 7, expression count is 0
+parse_cleanup : frame statement count is 8, expression count is 1
 brace_cleanup : orig line is 5, orig col is 12, Text() ')', type is PAREN_CLOSE, PRE is false
 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, orig col is 12, type is PAREN_CLOSE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 8, expression count is 1
+parse_cleanup : frame statement count is 9, expression count is 2
 brace_cleanup : orig line is 5, orig col is 13, <Newline>, PRE is false
 brace_cleanup : pp level is 0
 brace_cleanup : orig line is 6, orig col is 1, Text() '{', type is BRACE_OPEN, PRE is false
 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, orig col is 1, type is BRACE_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 9, expression count is 2
+parse_cleanup : frame statement count is 10, expression count is 3
+parse_cleanup : frame statement count is 0, expression count is 0
 brace_cleanup : orig line is 6, orig col is 2, <Newline>, PRE is false
 brace_cleanup : pp level is 0
 brace_cleanup : orig line is 7, orig col is 1, Text() '}', type is BRACE_CLOSE, PRE is false
 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, orig col is 1, type is BRACE_CLOSE, tos is 2, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 0, expression count is 0
+parse_cleanup : frame statement count is 1, expression count is 1
+parse_cleanup : frame statement count is 0, expression count is 0
 brace_cleanup : orig line is 7, orig col is 2, <Newline>, PRE is false
 brace_cleanup : pp level is 0
 brace_cleanup : orig line is 9, orig col is 1, Text() '~', type is INV, PRE is false
 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, orig col is 1, type is INV, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 0, expression count is 0
+parse_cleanup : frame statement count is 1, expression count is 1
 brace_cleanup : orig line is 9, orig col is 2, Text() 'TelegramIndex', type is WORD, PRE is false
 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, orig col is 2, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 1, expression count is 0
+parse_cleanup : frame statement count is 2, expression count is 1
 brace_cleanup : orig line is 9, orig col is 15, Text() '(', type is PAREN_OPEN, PRE is false
 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, orig col is 15, type is PAREN_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 2, expression count is 1
+parse_cleanup : frame statement count is 3, expression count is 2
 brace_cleanup : orig line is 9, orig col is 16, Text() ')', type is PAREN_CLOSE, PRE is false
 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, orig col is 16, type is PAREN_CLOSE, tos is 2, TOS.type is PAREN_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 3, expression count is 0
+parse_cleanup : frame statement count is 4, expression count is 1
 brace_cleanup : orig line is 9, orig col is 17, <Newline>, PRE is false
 brace_cleanup : pp level is 0
 brace_cleanup : orig line is 10, orig col is 1, Text() '{', type is BRACE_OPEN, PRE is false
 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, orig col is 1, type is BRACE_OPEN, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 4, expression count is 1
+parse_cleanup : frame statement count is 5, expression count is 2
+parse_cleanup : frame statement count is 0, expression count is 0
 brace_cleanup : orig line is 10, orig col is 2, <Newline>, PRE is false
 brace_cleanup : pp level is 0
 brace_cleanup : orig line is 11, orig col is 1, Text() '}', type is BRACE_CLOSE, PRE is false
 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, orig col is 1, type is BRACE_CLOSE, tos is 2, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 0, expression count is 0
+parse_cleanup : frame statement count is 1, expression count is 1
+parse_cleanup : frame statement count is 0, expression count is 0
 brace_cleanup : orig line is 11, orig col is 2, <Newline>, PRE is false
 brace_cleanup : pp level is 0
 brace_cleanup : orig line is 13, orig col is 1, Text() 'const', type is QUALIFIER, PRE is false
 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, orig col is 1, type is QUALIFIER, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 0, expression count is 0
+parse_cleanup : frame statement count is 1, expression count is 1
 brace_cleanup : orig line is 13, orig col is 7, Text() 'char', type is TYPE, PRE is false
 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, orig col is 7, type is TYPE, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 1, expression count is 1
+parse_cleanup : frame statement count is 2, expression count is 2
 brace_cleanup : orig line is 13, orig col is 11, Text() '*', type is PTR_TYPE, PRE is false
 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, orig col is 11, type is PTR_TYPE, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 2, expression count is 2
+parse_cleanup : frame statement count is 3, expression count is 3
 brace_cleanup : orig line is 13, orig col is 13, Text() 'const', type is QUALIFIER, PRE is false
 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, orig col is 13, type is QUALIFIER, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 3, expression count is 3
+parse_cleanup : frame statement count is 4, expression count is 4
 brace_cleanup : orig line is 13, orig col is 19, Text() 'pTelName', type is WORD, PRE is false
 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, orig col is 19, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 4, expression count is 4
+parse_cleanup : frame statement count is 5, expression count is 5
 brace_cleanup : orig line is 13, orig col is 27, Text() ';', type is SEMICOLON, PRE is false
 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, orig col is 27, type is SEMICOLON, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 5, expression count is 5
+parse_cleanup : frame statement count is 6, expression count is 6
+parse_cleanup : frame statement count is 0, expression count is 0
 brace_cleanup : orig line is 13, orig col is 28, <Newline>, PRE is false
 brace_cleanup : pp level is 0
 brace_cleanup : orig line is 14, orig col is 1, Text() 'unsigned', type is TYPE, PRE is false
 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, orig col is 1, type is TYPE, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 0, expression count is 0
+parse_cleanup : frame statement count is 1, expression count is 1
 brace_cleanup : orig line is 14, orig col is 10, Text() 'long', type is TYPE, PRE is false
 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, orig col is 10, type is TYPE, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 1, expression count is 1
+parse_cleanup : frame statement count is 2, expression count is 2
 brace_cleanup : orig line is 14, orig col is 15, Text() 'nTelIndex', type is WORD, PRE is false
 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, orig col is 15, type is WORD, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x0:]
 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
+parse_cleanup : frame statement count is 2, expression count is 2
+parse_cleanup : frame statement count is 3, expression count is 3
 brace_cleanup : orig line is 14, orig col is 24, Text() ';', type is SEMICOLON, PRE is false
 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, orig col is 24, type is SEMICOLON, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 3, expression count is 3
+parse_cleanup : frame statement count is 4, expression count is 4
+parse_cleanup : frame statement count is 0, expression count is 0
 brace_cleanup : orig line is 14, orig col is 25, <Newline>, PRE is false
 brace_cleanup : pp level is 0
 brace_cleanup : orig line is 15, orig col is 1, Text() '}', type is BRACE_CLOSE, PRE is false
 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, orig col is 1, type is BRACE_CLOSE, tos is 1, TOS.type is BRACE_OPEN, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 0, expression count is 0
+parse_cleanup : frame statement count is 1, expression count is 1
+parse_cleanup : frame statement count is 0, expression count is 0
 brace_cleanup : orig line is 15, orig col is 2, Text() ';', type is SEMICOLON, PRE is false
 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, orig col is 2, type is SEMICOLON, tos is 0, TOS.type is EOF, TOS.stage is NONE,    chunk flags: [0x200000000:PUNCTUATOR]
 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
+parse_cleanup : frame statement count is 0, expression count is 0
+parse_cleanup : frame statement count is 1, expression count is 1
+parse_cleanup : frame statement count is 0, expression count is 0
 brace_cleanup : orig line is 15, orig col is 3, <Newline>, PRE is false
 brace_cleanup : pp level is 0
 parameter_pack_cleanup : orig line is 1, orig col is 1, Text() 'struct', type is STRUCT, PRE is false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/31.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/31.txt
index d269b195..515b6978 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/31.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/31.txt
@@ -1,32 +1,32 @@
 indent_text : orig line is 1, orig col is 1, Text() 'struct', type is STRUCT, PRE is false
 indent_text : orig line is 1, orig col is 1, column is 1, for 'struct'
-   []
+      chunk flags: [0xe0000:FORCE_SPACE,STMT_START,EXPR_START]
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : pc orig line is 1, orig col is 1, Text() is 'struct', type is STRUCT
+indent_text :     pc orig line is 1, orig col is 1, Text() is 'struct', type is STRUCT
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
 reindent_line : orig line is 1, orig col is 1, on 'struct' [STRUCT/NONE] => 1
  [CallStack]
 indent_text : pc orig line is 1, orig col is 8, Text() is 'TelegramIndex', type is TYPE
 indent_text : orig line is 1, orig col is 8, Text() 'TelegramIndex', type is TYPE, PRE is false
 indent_text : orig line is 1, orig col is 8, column is 8, for 'TelegramIndex'
-   []
+      chunk flags: [0x0:]
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : pc orig line is 1, orig col is 8, Text() is 'TelegramIndex', type is TYPE
+indent_text :     pc orig line is 1, orig col is 8, Text() is 'TelegramIndex', type is TYPE
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
 indent_text : pc orig line is 1, orig col is 21, Text() is '', type is NEWLINE
 indent_text : orig line is 1, orig col is 21, <Newline>, PRE is false
 indent_text : orig line is 1, <Newline>
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : pc orig line is 1, orig col is 21, Text() is '', type is NEWLINE
+indent_text :     pc orig line is 1, orig col is 21, Text() is '', type is NEWLINE
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
 indent_text : frm.pse_tos is 0, ...indent is 1
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
 indent_text : pc orig line is 2, orig col is 1, Text() is '{', type is BRACE_OPEN
 indent_text : orig line is 2, orig col is 1, Text() '{', type is BRACE_OPEN, PRE is false
 indent_text : orig line is 2, orig col is 1, column is 1, for '{'
-   []
+      chunk flags: [0x200000400:IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : pc orig line is 2, orig col is 1, Text() is '{', type is BRACE_OPEN
+indent_text :     pc orig line is 2, orig col is 1, Text() is '{', type is BRACE_OPEN
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
 indent_text : frm.pse_tos is 1, ... indent is 9
 indent_text : orig line is 2, orig col is 1, Text() is '{', parent type is STRUCT
@@ -43,7 +43,7 @@ indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 3, orig col is 1, Text() is 'TelegramIndex', type is FUNC_CLASS_DEF
 indent_text : orig line is 3, orig col is 1, Text() 'TelegramIndex', type is FUNC_CLASS_DEF, PRE is false
 indent_text : orig line is 3, orig col is 1, column is 1, for 'TelegramIndex'
-   []
+      chunk flags: [0xc0402:IN_STRUCT,IN_CLASS,STMT_START,EXPR_START]
 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 1, on 'TelegramIndex' [FUNC_CLASS_DEF/NONE] => 9
@@ -51,7 +51,7 @@ reindent_line : orig line is 3, orig col is 1, on 'TelegramIndex' [FUNC_CLASS_DE
 indent_text : pc orig line is 3, orig col is 14, Text() is '(', type is FPAREN_OPEN
 indent_text : orig line is 3, orig col is 14, Text() '(', type is FPAREN_OPEN, PRE is false
 indent_text : orig line is 3, orig col is 14, column is 22, for '('
-   []
+      chunk flags: [0x200000502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 2, ...indent is 23
@@ -60,63 +60,63 @@ indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : pc orig line is 3, orig col is 15, Text() is 'const', type is QUALIFIER
 indent_text : orig line is 3, orig col is 15, Text() 'const', type is QUALIFIER, PRE is false
 indent_text : orig line is 3, orig col is 15, column is 23, for 'const'
-   []
+      chunk flags: [0xa0512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,FORCE_SPACE,EXPR_START]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : pc orig line is 3, orig col is 21, Text() is 'char', type is TYPE
 indent_text : orig line is 3, orig col is 21, Text() 'char', type is TYPE, PRE is false
 indent_text : orig line is 3, orig col is 21, column is 29, for 'char'
-   []
+      chunk flags: [0x800512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,VAR_TYPE]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : pc orig line is 3, orig col is 25, Text() is '*', type is PTR_TYPE
 indent_text : orig line is 3, orig col is 25, Text() '*', type is PTR_TYPE, PRE is false
 indent_text : orig line is 3, orig col is 25, column is 33, for '*'
-   []
+      chunk flags: [0x200000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : pc orig line is 3, orig col is 27, Text() is 'pN', type is WORD
 indent_text : orig line is 3, orig col is 27, Text() 'pN', type is WORD, PRE is false
 indent_text : orig line is 3, orig col is 27, column is 35, for 'pN'
-   []
+      chunk flags: [0x1000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,VAR_DEF]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : pc orig line is 3, orig col is 29, Text() is ',', type is COMMA
 indent_text : orig line is 3, orig col is 29, Text() ',', type is COMMA, PRE is false
 indent_text : orig line is 3, orig col is 29, column is 37, for ','
-   []
+      chunk flags: [0x200000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : pc orig line is 3, orig col is 31, Text() is 'unsigned', type is TYPE
 indent_text : orig line is 3, orig col is 31, Text() 'unsigned', type is TYPE, PRE is false
 indent_text : orig line is 3, orig col is 31, column is 39, for 'unsigned'
-   []
+      chunk flags: [0x8a0512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,FORCE_SPACE,EXPR_START,VAR_TYPE]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : pc orig line is 3, orig col is 40, Text() is 'long', type is TYPE
 indent_text : orig line is 3, orig col is 40, Text() 'long', type is TYPE, PRE is false
 indent_text : orig line is 3, orig col is 40, column is 48, for 'long'
-   []
+      chunk flags: [0x820512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,FORCE_SPACE,VAR_TYPE]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : pc orig line is 3, orig col is 45, Text() is 'nI', type is WORD
 indent_text : orig line is 3, orig col is 45, Text() 'nI', type is WORD, PRE is false
 indent_text : orig line is 3, orig col is 45, column is 53, for 'nI'
-   []
+      chunk flags: [0x1000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,VAR_DEF]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : pc orig line is 3, orig col is 47, Text() is ')', type is FPAREN_CLOSE
 indent_text : orig line is 3, orig col is 47, Text() ')', type is FPAREN_CLOSE, PRE is false
 indent_text : orig line is 3, orig col is 47, column is 55, for ')'
-   []
+      chunk flags: [0x200000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : pc orig line is 3, orig col is 47, Text() is ')', type is FPAREN_CLOSE
+indent_text :     pc orig line is 3, orig col is 47, Text() is ')', type is FPAREN_CLOSE
 indent_text : pc orig line is 3, orig col is 47, Text() is ')', type is FPAREN_CLOSE
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 3, orig col is 49, Text() is ':', type is CONSTR_COLON
 indent_text : orig line is 3, orig col is 49, Text() ':', type is CONSTR_COLON, PRE is false
 indent_text : orig line is 3, orig col is 49, column is 57, for ':'
-   []
+      chunk flags: [0x200000502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 2, ...indent is 17
@@ -125,25 +125,25 @@ indent_text : pc orig line is 3, orig col is 50, Text() is '', type is NEWLINE
 indent_text : orig line is 3, orig col is 50, <Newline>, PRE is false
 indent_text : orig line is 3, <Newline>
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc orig line is 3, orig col is 50, Text() is '', type is NEWLINE
+indent_text :     pc orig line is 3, orig col is 50, Text() is '', type is NEWLINE
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : frm.pse_tos is 2, ...indent is 17
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : pc orig line is 4, orig col is 1, Text() is 'pTelName', type is FUNC_CTOR_VAR
 indent_text : orig line is 4, orig col is 1, Text() 'pTelName', type is FUNC_CTOR_VAR, PRE is false
 indent_text : orig line is 4, orig col is 1, column is 1, for 'pTelName'
-   []
+      chunk flags: [0xc0502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,STMT_START,EXPR_START]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc orig line is 4, orig col is 1, Text() is 'pTelName', type is FUNC_CTOR_VAR
+indent_text :     pc orig line is 4, orig col is 1, Text() is 'pTelName', type is FUNC_CTOR_VAR
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 reindent_line : orig line is 4, orig col is 1, on 'pTelName' [FUNC_CTOR_VAR/NONE] => 17
  [CallStack]
 indent_text : pc orig line is 4, orig col is 9, Text() is '(', type is FPAREN_OPEN
 indent_text : orig line is 4, orig col is 9, Text() '(', type is FPAREN_OPEN, PRE is false
 indent_text : orig line is 4, orig col is 9, column is 25, for '('
-   []
+      chunk flags: [0x200000502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc orig line is 4, orig col is 9, Text() is '(', type is FPAREN_OPEN
+indent_text :     pc orig line is 4, orig col is 9, Text() is '(', type is FPAREN_OPEN
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : frm.pse_tos is 3, ...indent is 26
 indent_text : frm.pse_tos is 3, ...indent is 26
@@ -151,48 +151,48 @@ indent_text : frm.pse_tos is 3, ...indent_tmp is 26
 indent_text : pc orig line is 4, orig col is 10, Text() is 'pN', type is WORD
 indent_text : orig line is 4, orig col is 10, Text() 'pN', type is WORD, PRE is false
 indent_text : orig line is 4, orig col is 10, column is 26, for 'pN'
-   []
+      chunk flags: [0x80512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START]
 indent_text : frm.pse_tos is 3, ...indent_tmp is 26
 indent_text : frm.pse_tos is 3, ...indent_tmp is 26
 indent_text : pc orig line is 4, orig col is 12, Text() is ')', type is FPAREN_CLOSE
 indent_text : orig line is 4, orig col is 12, Text() ')', type is FPAREN_CLOSE, PRE is false
 indent_text : orig line is 4, orig col is 12, column is 28, for ')'
-   []
+      chunk flags: [0x200000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 3, ...indent_tmp is 26
+indent_text :     pc orig line is 4, orig col is 12, Text() is ')', type is FPAREN_CLOSE
 indent_text : pc orig line is 4, orig col is 12, Text() is ')', type is FPAREN_CLOSE
-indent_text : pc orig line is 4, orig col is 12, Text() is ')', type is FPAREN_CLOSE
-indent_text : pc orig line is 4, orig col is 12, Text() is ')', type is FPAREN_CLOSE
+indent_text :     pc orig line is 4, orig col is 12, Text() is ')', type is FPAREN_CLOSE
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : pc orig line is 4, orig col is 13, Text() is ',', type is COMMA
 indent_text : orig line is 4, orig col is 13, Text() ',', type is COMMA, PRE is false
 indent_text : orig line is 4, orig col is 13, column is 29, for ','
-   []
+      chunk flags: [0x200000502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc orig line is 4, orig col is 13, Text() is ',', type is COMMA
+indent_text :     pc orig line is 4, orig col is 13, Text() is ',', type is COMMA
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : pc orig line is 4, orig col is 14, Text() is '', type is NEWLINE
 indent_text : orig line is 4, orig col is 14, <Newline>, PRE is false
 indent_text : orig line is 4, <Newline>
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc orig line is 4, orig col is 14, Text() is '', type is NEWLINE
+indent_text :     pc orig line is 4, orig col is 14, Text() is '', type is NEWLINE
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : frm.pse_tos is 2, ...indent is 17
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : pc orig line is 5, orig col is 1, Text() is 'nTelIndex', type is FUNC_CTOR_VAR
 indent_text : orig line is 5, orig col is 1, Text() 'nTelIndex', type is FUNC_CTOR_VAR, PRE is false
 indent_text : orig line is 5, orig col is 1, column is 1, for 'nTelIndex'
-   []
+      chunk flags: [0x80502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,EXPR_START]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc orig line is 5, orig col is 1, Text() is 'nTelIndex', type is FUNC_CTOR_VAR
+indent_text :     pc orig line is 5, orig col is 1, Text() is 'nTelIndex', type is FUNC_CTOR_VAR
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 reindent_line : orig line is 5, orig col is 1, on 'nTelIndex' [FUNC_CTOR_VAR/NONE] => 17
  [CallStack]
 indent_text : pc orig line is 5, orig col is 10, Text() is '(', type is FPAREN_OPEN
 indent_text : orig line is 5, orig col is 10, Text() '(', type is FPAREN_OPEN, PRE is false
 indent_text : orig line is 5, orig col is 10, column is 26, for '('
-   []
+      chunk flags: [0x200000502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc orig line is 5, orig col is 10, Text() is '(', type is FPAREN_OPEN
+indent_text :     pc orig line is 5, orig col is 10, Text() is '(', type is FPAREN_OPEN
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : frm.pse_tos is 3, ...indent is 27
 indent_text : frm.pse_tos is 3, ...indent is 27
@@ -200,33 +200,33 @@ indent_text : frm.pse_tos is 3, ...indent_tmp is 27
 indent_text : pc orig line is 5, orig col is 11, Text() is 'n', type is WORD
 indent_text : orig line is 5, orig col is 11, Text() 'n', type is WORD, PRE is false
 indent_text : orig line is 5, orig col is 11, column is 27, for 'n'
-   []
+      chunk flags: [0x80512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START]
 indent_text : frm.pse_tos is 3, ...indent_tmp is 27
 indent_text : frm.pse_tos is 3, ...indent_tmp is 27
 indent_text : pc orig line is 5, orig col is 12, Text() is ')', type is FPAREN_CLOSE
 indent_text : orig line is 5, orig col is 12, Text() ')', type is FPAREN_CLOSE, PRE is false
 indent_text : orig line is 5, orig col is 12, column is 28, for ')'
-   []
+      chunk flags: [0x200000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 3, ...indent_tmp is 27
+indent_text :     pc orig line is 5, orig col is 12, Text() is ')', type is FPAREN_CLOSE
 indent_text : pc orig line is 5, orig col is 12, Text() is ')', type is FPAREN_CLOSE
-indent_text : pc orig line is 5, orig col is 12, Text() is ')', type is FPAREN_CLOSE
-indent_text : pc orig line is 5, orig col is 12, Text() is ')', type is FPAREN_CLOSE
+indent_text :     pc orig line is 5, orig col is 12, Text() is ')', type is FPAREN_CLOSE
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : pc orig line is 5, orig col is 13, Text() is '', type is NEWLINE
 indent_text : orig line is 5, orig col is 13, <Newline>, PRE is false
 indent_text : orig line is 5, <Newline>
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc orig line is 5, orig col is 13, Text() is '', type is NEWLINE
+indent_text :     pc orig line is 5, orig col is 13, Text() is '', type is NEWLINE
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : frm.pse_tos is 2, ...indent is 17
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : pc orig line is 6, orig col is 1, Text() is '{', type is BRACE_OPEN
 indent_text : orig line is 6, orig col is 1, Text() '{', type is BRACE_OPEN, PRE is false
 indent_text : orig line is 6, orig col is 1, column is 1, for '{'
-   []
+      chunk flags: [0x280000402:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : pc orig line is 6, orig col is 1, Text() is '{', type is BRACE_OPEN
-indent_text : pc orig line is 6, orig col is 1, Text() is '{', type is BRACE_OPEN
+indent_text :     pc orig line is 6, orig col is 1, Text() is '{', type is BRACE_OPEN
 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
@@ -243,9 +243,9 @@ 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
 indent_text : orig line is 7, orig col is 1, Text() '}', type is BRACE_CLOSE, PRE is false
 indent_text : orig line is 7, orig col is 1, column is 1, for '}'
-   []
+      chunk flags: [0x280000402:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR]
 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
+indent_text :     pc orig line is 7, orig col is 1, Text() is '}', type is BRACE_CLOSE
 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 1, on '}' [BRACE_CLOSE/FUNC_CLASS_DEF] => 9
@@ -260,7 +260,7 @@ indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 9, orig col is 1, Text() is '~', type is DESTRUCTOR
 indent_text : orig line is 9, orig col is 1, Text() '~', type is DESTRUCTOR, PRE is false
 indent_text : orig line is 9, orig col is 1, column is 1, for '~'
-   []
+      chunk flags: [0x2000c0402:IN_STRUCT,IN_CLASS,STMT_START,EXPR_START,PUNCTUATOR]
 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 1, on '~' [DESTRUCTOR/FUNC_CLASS_DEF] => 9
@@ -268,13 +268,13 @@ reindent_line : orig line is 9, orig col is 1, on '~' [DESTRUCTOR/FUNC_CLASS_DEF
 indent_text : pc orig line is 9, orig col is 2, Text() is 'TelegramIndex', type is FUNC_CLASS_DEF
 indent_text : orig line is 9, orig col is 2, Text() 'TelegramIndex', type is FUNC_CLASS_DEF, PRE is false
 indent_text : orig line is 9, orig col is 2, column is 10, for 'TelegramIndex'
-   []
+      chunk flags: [0x80402:IN_STRUCT,IN_CLASS,EXPR_START]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 9, orig col is 15, Text() is '(', type is FPAREN_OPEN
 indent_text : orig line is 9, orig col is 15, Text() '(', type is FPAREN_OPEN, PRE is false
 indent_text : orig line is 9, orig col is 15, column is 23, for '('
-   []
+      chunk flags: [0x200000502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 2, ...indent is 24
@@ -283,9 +283,9 @@ indent_text : frm.pse_tos is 2, ...indent_tmp is 24
 indent_text : pc orig line is 9, orig col is 16, Text() is ')', type is FPAREN_CLOSE
 indent_text : orig line is 9, orig col is 16, Text() ')', type is FPAREN_CLOSE, PRE is false
 indent_text : orig line is 9, orig col is 16, column is 24, for ')'
-   []
+      chunk flags: [0x200000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 24
-indent_text : pc orig line is 9, orig col is 16, Text() is ')', type is FPAREN_CLOSE
+indent_text :     pc orig line is 9, orig col is 16, Text() is ')', type is FPAREN_CLOSE
 indent_text : pc orig line is 9, orig col is 16, Text() is ')', type is FPAREN_CLOSE
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 9, orig col is 17, Text() is '', type is NEWLINE
@@ -298,7 +298,7 @@ indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 10, orig col is 1, Text() is '{', type is BRACE_OPEN
 indent_text : orig line is 10, orig col is 1, Text() '{', type is BRACE_OPEN, PRE is false
 indent_text : orig line is 10, orig col is 1, column is 1, for '{'
-   []
+      chunk flags: [0x280000402:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 2, ... indent is 17
@@ -316,9 +316,9 @@ 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
 indent_text : orig line is 11, orig col is 1, Text() '}', type is BRACE_CLOSE, PRE is false
 indent_text : orig line is 11, orig col is 1, column is 1, for '}'
-   []
+      chunk flags: [0x280000402:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR]
 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
+indent_text :     pc orig line is 11, orig col is 1, Text() is '}', type is BRACE_CLOSE
 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 1, on '}' [BRACE_CLOSE/FUNC_CLASS_DEF] => 9
@@ -333,7 +333,7 @@ indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 13, orig col is 1, Text() is 'const', type is QUALIFIER
 indent_text : orig line is 13, orig col is 1, Text() 'const', type is QUALIFIER, PRE is false
 indent_text : orig line is 13, orig col is 1, column is 1, for 'const'
-   []
+      chunk flags: [0x8e0402:IN_STRUCT,IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE]
 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 1, on 'const' [QUALIFIER/NONE] => 9
@@ -341,31 +341,31 @@ reindent_line : orig line is 13, orig col is 1, on 'const' [QUALIFIER/NONE] => 9
 indent_text : pc orig line is 13, orig col is 7, Text() is 'char', type is TYPE
 indent_text : orig line is 13, orig col is 7, Text() 'char', type is TYPE, PRE is false
 indent_text : orig line is 13, orig col is 7, column is 15, for 'char'
-   []
+      chunk flags: [0x800402:IN_STRUCT,IN_CLASS,VAR_TYPE]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 13, orig col is 11, Text() is '*', type is PTR_TYPE
 indent_text : orig line is 13, orig col is 11, Text() '*', type is PTR_TYPE, PRE is false
 indent_text : orig line is 13, orig col is 11, column is 19, for '*'
-   []
+      chunk flags: [0x200800402:IN_STRUCT,IN_CLASS,VAR_TYPE,PUNCTUATOR]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 13, orig col is 13, Text() is 'const', type is QUALIFIER
 indent_text : orig line is 13, orig col is 13, Text() 'const', type is QUALIFIER, PRE is false
 indent_text : orig line is 13, orig col is 13, column is 21, for 'const'
-   []
+      chunk flags: [0x820402:IN_STRUCT,IN_CLASS,FORCE_SPACE,VAR_TYPE]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 13, orig col is 19, Text() is 'pTelName', type is WORD
 indent_text : orig line is 13, orig col is 19, Text() 'pTelName', type is WORD, PRE is false
 indent_text : orig line is 13, orig col is 19, column is 27, for 'pTelName'
-   []
+      chunk flags: [0x3000402:IN_STRUCT,IN_CLASS,VAR_DEF,VAR_1ST]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 13, orig col is 27, Text() is ';', type is SEMICOLON
 indent_text : orig line is 13, orig col is 27, Text() ';', type is SEMICOLON, PRE is false
 indent_text : orig line is 13, orig col is 27, column is 35, for ';'
-   []
+      chunk flags: [0x200000402:IN_STRUCT,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 13, orig col is 28, Text() is '', type is NEWLINE
@@ -378,7 +378,7 @@ indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 14, orig col is 1, Text() is 'unsigned', type is TYPE
 indent_text : orig line is 14, orig col is 1, Text() 'unsigned', type is TYPE, PRE is false
 indent_text : orig line is 14, orig col is 1, column is 1, for 'unsigned'
-   []
+      chunk flags: [0x8e0402:IN_STRUCT,IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE]
 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 1, on 'unsigned' [TYPE/NONE] => 9
@@ -386,19 +386,19 @@ reindent_line : orig line is 14, orig col is 1, on 'unsigned' [TYPE/NONE] => 9
 indent_text : pc orig line is 14, orig col is 10, Text() is 'long', type is TYPE
 indent_text : orig line is 14, orig col is 10, Text() 'long', type is TYPE, PRE is false
 indent_text : orig line is 14, orig col is 10, column is 18, for 'long'
-   []
+      chunk flags: [0x820402:IN_STRUCT,IN_CLASS,FORCE_SPACE,VAR_TYPE]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 14, orig col is 15, Text() is 'nTelIndex', type is WORD
 indent_text : orig line is 14, orig col is 15, Text() 'nTelIndex', type is WORD, PRE is false
 indent_text : orig line is 14, orig col is 15, column is 23, for 'nTelIndex'
-   []
+      chunk flags: [0x3000402:IN_STRUCT,IN_CLASS,VAR_DEF,VAR_1ST]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 14, orig col is 24, Text() is ';', type is SEMICOLON
 indent_text : orig line is 14, orig col is 24, Text() ';', type is SEMICOLON, PRE is false
 indent_text : orig line is 14, orig col is 24, column is 32, for ';'
-   []
+      chunk flags: [0x200000402:IN_STRUCT,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 14, orig col is 25, Text() is '', type is NEWLINE
@@ -411,9 +411,9 @@ indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 15, orig col is 1, Text() is '}', type is BRACE_CLOSE
 indent_text : orig line is 15, orig col is 1, Text() '}', type is BRACE_CLOSE, PRE is false
 indent_text : orig line is 15, orig col is 1, column is 1, for '}'
-   []
+      chunk flags: [0x200000402:IN_STRUCT,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : pc orig line is 15, orig col is 1, Text() is '}', type is BRACE_CLOSE
+indent_text :     pc orig line is 15, orig col is 1, Text() is '}', type is BRACE_CLOSE
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 15, orig col is 1, Text() is '}', type is BRACE_CLOSE
 reindent_line : orig line is 15, orig col is 1, on '}' [BRACE_CLOSE/STRUCT] => 1
@@ -421,50 +421,74 @@ reindent_line : orig line is 15, orig col is 1, on '}' [BRACE_CLOSE/STRUCT] => 1
 indent_text : pc orig line is 15, orig col is 2, Text() is ';', type is SEMICOLON
 indent_text : orig line is 15, orig col is 2, Text() ';', type is SEMICOLON, PRE is false
 indent_text : orig line is 15, orig col is 2, column is 2, for ';'
-   []
+      chunk flags: [0x200000000:PUNCTUATOR]
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : pc orig line is 15, orig col is 2, Text() is ';', type is SEMICOLON
+indent_text :     pc orig line is 15, orig col is 2, Text() is ';', type is SEMICOLON
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
 indent_text : pc orig line is 15, orig col is 3, Text() is '', type is NEWLINE
 indent_text : orig line is 15, orig col is 3, <Newline>, PRE is false
 indent_text : orig line is 15, <Newline>
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : pc orig line is 15, orig col is 3, Text() is '', type is NEWLINE
+indent_text :     pc orig line is 15, orig col is 3, Text() is '', type is NEWLINE
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
 indent_text : frm.pse_tos is 0, ...indent is 1
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
 indent_text : pc orig line is 0, orig col is 0, Text() is '', type is NONE
 indent_text : before quick_align_again
+reindent_line : orig line is 2, orig col is 1, on '{' [BRACE_OPEN/STRUCT] => 1
+ [CallStack]
+reindent_line : orig line is 3, orig col is 1, on 'TelegramIndex' [FUNC_CLASS_DEF/NONE] => 9
+ [CallStack]
+reindent_line : orig line is 4, orig col is 1, on 'pTelName' [FUNC_CTOR_VAR/NONE] => 17
+ [CallStack]
+reindent_line : orig line is 5, orig col is 1, on 'nTelIndex' [FUNC_CTOR_VAR/NONE] => 17
+ [CallStack]
+reindent_line : orig line is 6, orig col is 1, on '{' [BRACE_OPEN/FUNC_CLASS_DEF] => 9
+ [CallStack]
+reindent_line : orig line is 7, orig col is 1, on '}' [BRACE_CLOSE/FUNC_CLASS_DEF] => 9
+ [CallStack]
+reindent_line : orig line is 9, orig col is 1, on '~' [DESTRUCTOR/FUNC_CLASS_DEF] => 9
+ [CallStack]
+reindent_line : orig line is 10, orig col is 1, on '{' [BRACE_OPEN/FUNC_CLASS_DEF] => 9
+ [CallStack]
+reindent_line : orig line is 11, orig col is 1, on '}' [BRACE_CLOSE/FUNC_CLASS_DEF] => 9
+ [CallStack]
+reindent_line : orig line is 13, orig col is 1, on 'const' [QUALIFIER/NONE] => 9
+ [CallStack]
+reindent_line : orig line is 14, orig col is 1, on 'unsigned' [TYPE/NONE] => 9
+ [CallStack]
+reindent_line : orig line is 15, orig col is 1, on '}' [BRACE_CLOSE/STRUCT] => 1
+ [CallStack]
 indent_text : after quick_align_again
 indent_text : orig line is 1, orig col is 1, Text() 'struct', type is STRUCT, PRE is false
 indent_text : orig line is 1, orig col is 1, column is 1, for 'struct'
-   []
+      chunk flags: [0xe0000:FORCE_SPACE,STMT_START,EXPR_START]
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : pc orig line is 1, orig col is 1, Text() is 'struct', type is STRUCT
+indent_text :     pc orig line is 1, orig col is 1, Text() is 'struct', type is STRUCT
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
 reindent_line : orig line is 1, orig col is 1, on 'struct' [STRUCT/NONE] => 1
  [CallStack]
 indent_text : pc orig line is 1, orig col is 8, Text() is 'TelegramIndex', type is TYPE
 indent_text : orig line is 1, orig col is 8, Text() 'TelegramIndex', type is TYPE, PRE is false
 indent_text : orig line is 1, orig col is 8, column is 8, for 'TelegramIndex'
-   []
+      chunk flags: [0x0:]
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : pc orig line is 1, orig col is 8, Text() is 'TelegramIndex', type is TYPE
+indent_text :     pc orig line is 1, orig col is 8, Text() is 'TelegramIndex', type is TYPE
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
 indent_text : pc orig line is 1, orig col is 21, Text() is '', type is NEWLINE
 indent_text : orig line is 1, orig col is 21, <Newline>, PRE is false
 indent_text : orig line is 1, <Newline>
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : pc orig line is 1, orig col is 21, Text() is '', type is NEWLINE
+indent_text :     pc orig line is 1, orig col is 21, Text() is '', type is NEWLINE
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
 indent_text : frm.pse_tos is 0, ...indent is 1
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
 indent_text : pc orig line is 2, orig col is 1, Text() is '{', type is BRACE_OPEN
 indent_text : orig line is 2, orig col is 1, Text() '{', type is BRACE_OPEN, PRE is false
 indent_text : orig line is 2, orig col is 1, column is 1, for '{'
-   []
+      chunk flags: [0x200000400:IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : pc orig line is 2, orig col is 1, Text() is '{', type is BRACE_OPEN
+indent_text :     pc orig line is 2, orig col is 1, Text() is '{', type is BRACE_OPEN
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
 indent_text : frm.pse_tos is 1, ... indent is 9
 indent_text : orig line is 2, orig col is 1, Text() is '{', parent type is STRUCT
@@ -481,7 +505,7 @@ indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 3, orig col is 1, Text() is 'TelegramIndex', type is FUNC_CLASS_DEF
 indent_text : orig line is 3, orig col is 1, Text() 'TelegramIndex', type is FUNC_CLASS_DEF, PRE is false
 indent_text : orig line is 3, orig col is 1, column is 9, for 'TelegramIndex'
-   []
+      chunk flags: [0xc0402:IN_STRUCT,IN_CLASS,STMT_START,EXPR_START]
 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 1, on 'TelegramIndex' [FUNC_CLASS_DEF/NONE] => 9
@@ -489,7 +513,7 @@ reindent_line : orig line is 3, orig col is 1, on 'TelegramIndex' [FUNC_CLASS_DE
 indent_text : pc orig line is 3, orig col is 14, Text() is '(', type is FPAREN_OPEN
 indent_text : orig line is 3, orig col is 14, Text() '(', type is FPAREN_OPEN, PRE is false
 indent_text : orig line is 3, orig col is 14, column is 22, for '('
-   []
+      chunk flags: [0x200000502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 2, ...indent is 23
@@ -498,63 +522,63 @@ indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : pc orig line is 3, orig col is 15, Text() is 'const', type is QUALIFIER
 indent_text : orig line is 3, orig col is 15, Text() 'const', type is QUALIFIER, PRE is false
 indent_text : orig line is 3, orig col is 15, column is 23, for 'const'
-   []
+      chunk flags: [0xa0512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,FORCE_SPACE,EXPR_START]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : pc orig line is 3, orig col is 21, Text() is 'char', type is TYPE
 indent_text : orig line is 3, orig col is 21, Text() 'char', type is TYPE, PRE is false
 indent_text : orig line is 3, orig col is 21, column is 29, for 'char'
-   []
+      chunk flags: [0x800512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,VAR_TYPE]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : pc orig line is 3, orig col is 25, Text() is '*', type is PTR_TYPE
 indent_text : orig line is 3, orig col is 25, Text() '*', type is PTR_TYPE, PRE is false
 indent_text : orig line is 3, orig col is 25, column is 33, for '*'
-   []
+      chunk flags: [0x200000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : pc orig line is 3, orig col is 27, Text() is 'pN', type is WORD
 indent_text : orig line is 3, orig col is 27, Text() 'pN', type is WORD, PRE is false
 indent_text : orig line is 3, orig col is 27, column is 35, for 'pN'
-   []
+      chunk flags: [0x1000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,VAR_DEF]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : pc orig line is 3, orig col is 29, Text() is ',', type is COMMA
 indent_text : orig line is 3, orig col is 29, Text() ',', type is COMMA, PRE is false
 indent_text : orig line is 3, orig col is 29, column is 37, for ','
-   []
+      chunk flags: [0x200000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : pc orig line is 3, orig col is 31, Text() is 'unsigned', type is TYPE
 indent_text : orig line is 3, orig col is 31, Text() 'unsigned', type is TYPE, PRE is false
 indent_text : orig line is 3, orig col is 31, column is 39, for 'unsigned'
-   []
+      chunk flags: [0x8a0512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,FORCE_SPACE,EXPR_START,VAR_TYPE]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : pc orig line is 3, orig col is 40, Text() is 'long', type is TYPE
 indent_text : orig line is 3, orig col is 40, Text() 'long', type is TYPE, PRE is false
 indent_text : orig line is 3, orig col is 40, column is 48, for 'long'
-   []
+      chunk flags: [0x820512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,FORCE_SPACE,VAR_TYPE]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : pc orig line is 3, orig col is 45, Text() is 'nI', type is WORD
 indent_text : orig line is 3, orig col is 45, Text() 'nI', type is WORD, PRE is false
 indent_text : orig line is 3, orig col is 45, column is 53, for 'nI'
-   []
+      chunk flags: [0x1000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,VAR_DEF]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
 indent_text : pc orig line is 3, orig col is 47, Text() is ')', type is FPAREN_CLOSE
 indent_text : orig line is 3, orig col is 47, Text() ')', type is FPAREN_CLOSE, PRE is false
 indent_text : orig line is 3, orig col is 47, column is 55, for ')'
-   []
+      chunk flags: [0x200000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 23
-indent_text : pc orig line is 3, orig col is 47, Text() is ')', type is FPAREN_CLOSE
+indent_text :     pc orig line is 3, orig col is 47, Text() is ')', type is FPAREN_CLOSE
 indent_text : pc orig line is 3, orig col is 47, Text() is ')', type is FPAREN_CLOSE
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 3, orig col is 49, Text() is ':', type is CONSTR_COLON
 indent_text : orig line is 3, orig col is 49, Text() ':', type is CONSTR_COLON, PRE is false
 indent_text : orig line is 3, orig col is 49, column is 57, for ':'
-   []
+      chunk flags: [0x200000502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 2, ...indent is 17
@@ -563,25 +587,25 @@ indent_text : pc orig line is 3, orig col is 50, Text() is '', type is NEWLINE
 indent_text : orig line is 3, orig col is 50, <Newline>, PRE is false
 indent_text : orig line is 3, <Newline>
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc orig line is 3, orig col is 50, Text() is '', type is NEWLINE
+indent_text :     pc orig line is 3, orig col is 50, Text() is '', type is NEWLINE
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : frm.pse_tos is 2, ...indent is 17
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : pc orig line is 4, orig col is 1, Text() is 'pTelName', type is FUNC_CTOR_VAR
 indent_text : orig line is 4, orig col is 1, Text() 'pTelName', type is FUNC_CTOR_VAR, PRE is false
 indent_text : orig line is 4, orig col is 1, column is 17, for 'pTelName'
-   []
+      chunk flags: [0xc0502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,STMT_START,EXPR_START]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc orig line is 4, orig col is 1, Text() is 'pTelName', type is FUNC_CTOR_VAR
+indent_text :     pc orig line is 4, orig col is 1, Text() is 'pTelName', type is FUNC_CTOR_VAR
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 reindent_line : orig line is 4, orig col is 1, on 'pTelName' [FUNC_CTOR_VAR/NONE] => 17
  [CallStack]
 indent_text : pc orig line is 4, orig col is 9, Text() is '(', type is FPAREN_OPEN
 indent_text : orig line is 4, orig col is 9, Text() '(', type is FPAREN_OPEN, PRE is false
 indent_text : orig line is 4, orig col is 9, column is 25, for '('
-   []
+      chunk flags: [0x200000502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc orig line is 4, orig col is 9, Text() is '(', type is FPAREN_OPEN
+indent_text :     pc orig line is 4, orig col is 9, Text() is '(', type is FPAREN_OPEN
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : frm.pse_tos is 3, ...indent is 26
 indent_text : frm.pse_tos is 3, ...indent is 26
@@ -589,48 +613,48 @@ indent_text : frm.pse_tos is 3, ...indent_tmp is 26
 indent_text : pc orig line is 4, orig col is 10, Text() is 'pN', type is WORD
 indent_text : orig line is 4, orig col is 10, Text() 'pN', type is WORD, PRE is false
 indent_text : orig line is 4, orig col is 10, column is 26, for 'pN'
-   []
+      chunk flags: [0x80512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START]
 indent_text : frm.pse_tos is 3, ...indent_tmp is 26
 indent_text : frm.pse_tos is 3, ...indent_tmp is 26
 indent_text : pc orig line is 4, orig col is 12, Text() is ')', type is FPAREN_CLOSE
 indent_text : orig line is 4, orig col is 12, Text() ')', type is FPAREN_CLOSE, PRE is false
 indent_text : orig line is 4, orig col is 12, column is 28, for ')'
-   []
+      chunk flags: [0x200000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 3, ...indent_tmp is 26
+indent_text :     pc orig line is 4, orig col is 12, Text() is ')', type is FPAREN_CLOSE
 indent_text : pc orig line is 4, orig col is 12, Text() is ')', type is FPAREN_CLOSE
-indent_text : pc orig line is 4, orig col is 12, Text() is ')', type is FPAREN_CLOSE
-indent_text : pc orig line is 4, orig col is 12, Text() is ')', type is FPAREN_CLOSE
+indent_text :     pc orig line is 4, orig col is 12, Text() is ')', type is FPAREN_CLOSE
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : pc orig line is 4, orig col is 13, Text() is ',', type is COMMA
 indent_text : orig line is 4, orig col is 13, Text() ',', type is COMMA, PRE is false
 indent_text : orig line is 4, orig col is 13, column is 29, for ','
-   []
+      chunk flags: [0x200000502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc orig line is 4, orig col is 13, Text() is ',', type is COMMA
+indent_text :     pc orig line is 4, orig col is 13, Text() is ',', type is COMMA
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : pc orig line is 4, orig col is 14, Text() is '', type is NEWLINE
 indent_text : orig line is 4, orig col is 14, <Newline>, PRE is false
 indent_text : orig line is 4, <Newline>
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc orig line is 4, orig col is 14, Text() is '', type is NEWLINE
+indent_text :     pc orig line is 4, orig col is 14, Text() is '', type is NEWLINE
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : frm.pse_tos is 2, ...indent is 17
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : pc orig line is 5, orig col is 1, Text() is 'nTelIndex', type is FUNC_CTOR_VAR
 indent_text : orig line is 5, orig col is 1, Text() 'nTelIndex', type is FUNC_CTOR_VAR, PRE is false
 indent_text : orig line is 5, orig col is 1, column is 17, for 'nTelIndex'
-   []
+      chunk flags: [0x80502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,EXPR_START]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc orig line is 5, orig col is 1, Text() is 'nTelIndex', type is FUNC_CTOR_VAR
+indent_text :     pc orig line is 5, orig col is 1, Text() is 'nTelIndex', type is FUNC_CTOR_VAR
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 reindent_line : orig line is 5, orig col is 1, on 'nTelIndex' [FUNC_CTOR_VAR/NONE] => 17
  [CallStack]
 indent_text : pc orig line is 5, orig col is 10, Text() is '(', type is FPAREN_OPEN
 indent_text : orig line is 5, orig col is 10, Text() '(', type is FPAREN_OPEN, PRE is false
 indent_text : orig line is 5, orig col is 10, column is 26, for '('
-   []
+      chunk flags: [0x200000502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc orig line is 5, orig col is 10, Text() is '(', type is FPAREN_OPEN
+indent_text :     pc orig line is 5, orig col is 10, Text() is '(', type is FPAREN_OPEN
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : frm.pse_tos is 3, ...indent is 27
 indent_text : frm.pse_tos is 3, ...indent is 27
@@ -638,33 +662,33 @@ indent_text : frm.pse_tos is 3, ...indent_tmp is 27
 indent_text : pc orig line is 5, orig col is 11, Text() is 'n', type is WORD
 indent_text : orig line is 5, orig col is 11, Text() 'n', type is WORD, PRE is false
 indent_text : orig line is 5, orig col is 11, column is 27, for 'n'
-   []
+      chunk flags: [0x80512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,EXPR_START]
 indent_text : frm.pse_tos is 3, ...indent_tmp is 27
 indent_text : frm.pse_tos is 3, ...indent_tmp is 27
 indent_text : pc orig line is 5, orig col is 12, Text() is ')', type is FPAREN_CLOSE
 indent_text : orig line is 5, orig col is 12, Text() ')', type is FPAREN_CLOSE, PRE is false
 indent_text : orig line is 5, orig col is 12, column is 28, for ')'
-   []
+      chunk flags: [0x200000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 3, ...indent_tmp is 27
+indent_text :     pc orig line is 5, orig col is 12, Text() is ')', type is FPAREN_CLOSE
 indent_text : pc orig line is 5, orig col is 12, Text() is ')', type is FPAREN_CLOSE
-indent_text : pc orig line is 5, orig col is 12, Text() is ')', type is FPAREN_CLOSE
-indent_text : pc orig line is 5, orig col is 12, Text() is ')', type is FPAREN_CLOSE
+indent_text :     pc orig line is 5, orig col is 12, Text() is ')', type is FPAREN_CLOSE
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : pc orig line is 5, orig col is 13, Text() is '', type is NEWLINE
 indent_text : orig line is 5, orig col is 13, <Newline>, PRE is false
 indent_text : orig line is 5, <Newline>
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
-indent_text : pc orig line is 5, orig col is 13, Text() is '', type is NEWLINE
+indent_text :     pc orig line is 5, orig col is 13, Text() is '', type is NEWLINE
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : frm.pse_tos is 2, ...indent is 17
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : pc orig line is 6, orig col is 1, Text() is '{', type is BRACE_OPEN
 indent_text : orig line is 6, orig col is 1, Text() '{', type is BRACE_OPEN, PRE is false
 indent_text : orig line is 6, orig col is 1, column is 9, for '{'
-   []
+      chunk flags: [0x280000402:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 17
 indent_text : pc orig line is 6, orig col is 1, Text() is '{', type is BRACE_OPEN
-indent_text : pc orig line is 6, orig col is 1, Text() is '{', type is BRACE_OPEN
+indent_text :     pc orig line is 6, orig col is 1, Text() is '{', type is BRACE_OPEN
 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
@@ -681,9 +705,9 @@ 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
 indent_text : orig line is 7, orig col is 1, Text() '}', type is BRACE_CLOSE, PRE is false
 indent_text : orig line is 7, orig col is 1, column is 9, for '}'
-   []
+      chunk flags: [0x280000402:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR]
 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
+indent_text :     pc orig line is 7, orig col is 1, Text() is '}', type is BRACE_CLOSE
 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 1, on '}' [BRACE_CLOSE/FUNC_CLASS_DEF] => 9
@@ -698,7 +722,7 @@ indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 9, orig col is 1, Text() is '~', type is DESTRUCTOR
 indent_text : orig line is 9, orig col is 1, Text() '~', type is DESTRUCTOR, PRE is false
 indent_text : orig line is 9, orig col is 1, column is 9, for '~'
-   []
+      chunk flags: [0x2000c0402:IN_STRUCT,IN_CLASS,STMT_START,EXPR_START,PUNCTUATOR]
 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 1, on '~' [DESTRUCTOR/FUNC_CLASS_DEF] => 9
@@ -706,13 +730,13 @@ reindent_line : orig line is 9, orig col is 1, on '~' [DESTRUCTOR/FUNC_CLASS_DEF
 indent_text : pc orig line is 9, orig col is 2, Text() is 'TelegramIndex', type is FUNC_CLASS_DEF
 indent_text : orig line is 9, orig col is 2, Text() 'TelegramIndex', type is FUNC_CLASS_DEF, PRE is false
 indent_text : orig line is 9, orig col is 2, column is 10, for 'TelegramIndex'
-   []
+      chunk flags: [0x80402:IN_STRUCT,IN_CLASS,EXPR_START]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 9, orig col is 15, Text() is '(', type is FPAREN_OPEN
 indent_text : orig line is 9, orig col is 15, Text() '(', type is FPAREN_OPEN, PRE is false
 indent_text : orig line is 9, orig col is 15, column is 23, for '('
-   []
+      chunk flags: [0x200000502:IN_STRUCT,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 2, ...indent is 24
@@ -721,9 +745,9 @@ indent_text : frm.pse_tos is 2, ...indent_tmp is 24
 indent_text : pc orig line is 9, orig col is 16, Text() is ')', type is FPAREN_CLOSE
 indent_text : orig line is 9, orig col is 16, Text() ')', type is FPAREN_CLOSE, PRE is false
 indent_text : orig line is 9, orig col is 16, column is 24, for ')'
-   []
+      chunk flags: [0x200000512:IN_STRUCT,IN_FCN_CALL,IN_CONST_ARGS,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 2, ...indent_tmp is 24
-indent_text : pc orig line is 9, orig col is 16, Text() is ')', type is FPAREN_CLOSE
+indent_text :     pc orig line is 9, orig col is 16, Text() is ')', type is FPAREN_CLOSE
 indent_text : pc orig line is 9, orig col is 16, Text() is ')', type is FPAREN_CLOSE
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 9, orig col is 17, Text() is '', type is NEWLINE
@@ -736,7 +760,7 @@ indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 10, orig col is 1, Text() is '{', type is BRACE_OPEN
 indent_text : orig line is 10, orig col is 1, Text() '{', type is BRACE_OPEN, PRE is false
 indent_text : orig line is 10, orig col is 1, column is 9, for '{'
-   []
+      chunk flags: [0x280000402:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 2, ... indent is 17
@@ -754,9 +778,9 @@ 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
 indent_text : orig line is 11, orig col is 1, Text() '}', type is BRACE_CLOSE, PRE is false
 indent_text : orig line is 11, orig col is 1, column is 9, for '}'
-   []
+      chunk flags: [0x280000402:IN_STRUCT,IN_CLASS,EMPTY_BODY,PUNCTUATOR]
 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
+indent_text :     pc orig line is 11, orig col is 1, Text() is '}', type is BRACE_CLOSE
 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 1, on '}' [BRACE_CLOSE/FUNC_CLASS_DEF] => 9
@@ -771,7 +795,7 @@ indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 13, orig col is 1, Text() is 'const', type is QUALIFIER
 indent_text : orig line is 13, orig col is 1, Text() 'const', type is QUALIFIER, PRE is false
 indent_text : orig line is 13, orig col is 1, column is 9, for 'const'
-   []
+      chunk flags: [0x8e0402:IN_STRUCT,IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE]
 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 1, on 'const' [QUALIFIER/NONE] => 9
@@ -779,31 +803,31 @@ reindent_line : orig line is 13, orig col is 1, on 'const' [QUALIFIER/NONE] => 9
 indent_text : pc orig line is 13, orig col is 7, Text() is 'char', type is TYPE
 indent_text : orig line is 13, orig col is 7, Text() 'char', type is TYPE, PRE is false
 indent_text : orig line is 13, orig col is 7, column is 15, for 'char'
-   []
+      chunk flags: [0x800402:IN_STRUCT,IN_CLASS,VAR_TYPE]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 13, orig col is 11, Text() is '*', type is PTR_TYPE
 indent_text : orig line is 13, orig col is 11, Text() '*', type is PTR_TYPE, PRE is false
 indent_text : orig line is 13, orig col is 11, column is 19, for '*'
-   []
+      chunk flags: [0x200800402:IN_STRUCT,IN_CLASS,VAR_TYPE,PUNCTUATOR]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 13, orig col is 13, Text() is 'const', type is QUALIFIER
 indent_text : orig line is 13, orig col is 13, Text() 'const', type is QUALIFIER, PRE is false
 indent_text : orig line is 13, orig col is 13, column is 21, for 'const'
-   []
+      chunk flags: [0x820402:IN_STRUCT,IN_CLASS,FORCE_SPACE,VAR_TYPE]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 13, orig col is 19, Text() is 'pTelName', type is WORD
 indent_text : orig line is 13, orig col is 19, Text() 'pTelName', type is WORD, PRE is false
 indent_text : orig line is 13, orig col is 19, column is 27, for 'pTelName'
-   []
+      chunk flags: [0x3000402:IN_STRUCT,IN_CLASS,VAR_DEF,VAR_1ST]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 13, orig col is 27, Text() is ';', type is SEMICOLON
 indent_text : orig line is 13, orig col is 27, Text() ';', type is SEMICOLON, PRE is false
 indent_text : orig line is 13, orig col is 27, column is 35, for ';'
-   []
+      chunk flags: [0x200000402:IN_STRUCT,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 13, orig col is 28, Text() is '', type is NEWLINE
@@ -816,7 +840,7 @@ indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 14, orig col is 1, Text() is 'unsigned', type is TYPE
 indent_text : orig line is 14, orig col is 1, Text() 'unsigned', type is TYPE, PRE is false
 indent_text : orig line is 14, orig col is 1, column is 9, for 'unsigned'
-   []
+      chunk flags: [0x8e0402:IN_STRUCT,IN_CLASS,FORCE_SPACE,STMT_START,EXPR_START,VAR_TYPE]
 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 1, on 'unsigned' [TYPE/NONE] => 9
@@ -824,19 +848,19 @@ reindent_line : orig line is 14, orig col is 1, on 'unsigned' [TYPE/NONE] => 9
 indent_text : pc orig line is 14, orig col is 10, Text() is 'long', type is TYPE
 indent_text : orig line is 14, orig col is 10, Text() 'long', type is TYPE, PRE is false
 indent_text : orig line is 14, orig col is 10, column is 18, for 'long'
-   []
+      chunk flags: [0x820402:IN_STRUCT,IN_CLASS,FORCE_SPACE,VAR_TYPE]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 14, orig col is 15, Text() is 'nTelIndex', type is WORD
 indent_text : orig line is 14, orig col is 15, Text() 'nTelIndex', type is WORD, PRE is false
 indent_text : orig line is 14, orig col is 15, column is 23, for 'nTelIndex'
-   []
+      chunk flags: [0x3000402:IN_STRUCT,IN_CLASS,VAR_DEF,VAR_1ST]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 14, orig col is 24, Text() is ';', type is SEMICOLON
 indent_text : orig line is 14, orig col is 24, Text() ';', type is SEMICOLON, PRE is false
 indent_text : orig line is 14, orig col is 24, column is 32, for ';'
-   []
+      chunk flags: [0x200000402:IN_STRUCT,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 14, orig col is 25, Text() is '', type is NEWLINE
@@ -849,9 +873,9 @@ indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 15, orig col is 1, Text() is '}', type is BRACE_CLOSE
 indent_text : orig line is 15, orig col is 1, Text() '}', type is BRACE_CLOSE, PRE is false
 indent_text : orig line is 15, orig col is 1, column is 1, for '}'
-   []
+      chunk flags: [0x200000402:IN_STRUCT,IN_CLASS,PUNCTUATOR]
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
-indent_text : pc orig line is 15, orig col is 1, Text() is '}', type is BRACE_CLOSE
+indent_text :     pc orig line is 15, orig col is 1, Text() is '}', type is BRACE_CLOSE
 indent_text : frm.pse_tos is 1, ...indent_tmp is 9
 indent_text : pc orig line is 15, orig col is 1, Text() is '}', type is BRACE_CLOSE
 reindent_line : orig line is 15, orig col is 1, on '}' [BRACE_CLOSE/STRUCT] => 1
@@ -859,18 +883,42 @@ reindent_line : orig line is 15, orig col is 1, on '}' [BRACE_CLOSE/STRUCT] => 1
 indent_text : pc orig line is 15, orig col is 2, Text() is ';', type is SEMICOLON
 indent_text : orig line is 15, orig col is 2, Text() ';', type is SEMICOLON, PRE is false
 indent_text : orig line is 15, orig col is 2, column is 2, for ';'
-   []
+      chunk flags: [0x200000000:PUNCTUATOR]
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : pc orig line is 15, orig col is 2, Text() is ';', type is SEMICOLON
+indent_text :     pc orig line is 15, orig col is 2, Text() is ';', type is SEMICOLON
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
 indent_text : pc orig line is 15, orig col is 3, Text() is '', type is NEWLINE
 indent_text : orig line is 15, orig col is 3, <Newline>, PRE is false
 indent_text : orig line is 15, <Newline>
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
-indent_text : pc orig line is 15, orig col is 3, Text() is '', type is NEWLINE
+indent_text :     pc orig line is 15, orig col is 3, Text() is '', type is NEWLINE
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
 indent_text : frm.pse_tos is 0, ...indent is 1
 indent_text : frm.pse_tos is 0, ...indent_tmp is 1
 indent_text : pc orig line is 0, orig col is 0, Text() is '', type is NONE
 indent_text : before quick_align_again
+reindent_line : orig line is 2, orig col is 1, on '{' [BRACE_OPEN/STRUCT] => 1
+ [CallStack]
+reindent_line : orig line is 3, orig col is 1, on 'TelegramIndex' [FUNC_CLASS_DEF/NONE] => 9
+ [CallStack]
+reindent_line : orig line is 4, orig col is 1, on 'pTelName' [FUNC_CTOR_VAR/NONE] => 17
+ [CallStack]
+reindent_line : orig line is 5, orig col is 1, on 'nTelIndex' [FUNC_CTOR_VAR/NONE] => 17
+ [CallStack]
+reindent_line : orig line is 6, orig col is 1, on '{' [BRACE_OPEN/FUNC_CLASS_DEF] => 9
+ [CallStack]
+reindent_line : orig line is 7, orig col is 1, on '}' [BRACE_CLOSE/FUNC_CLASS_DEF] => 9
+ [CallStack]
+reindent_line : orig line is 9, orig col is 1, on '~' [DESTRUCTOR/FUNC_CLASS_DEF] => 9
+ [CallStack]
+reindent_line : orig line is 10, orig col is 1, on '{' [BRACE_OPEN/FUNC_CLASS_DEF] => 9
+ [CallStack]
+reindent_line : orig line is 11, orig col is 1, on '}' [BRACE_CLOSE/FUNC_CLASS_DEF] => 9
+ [CallStack]
+reindent_line : orig line is 13, orig col is 1, on 'const' [QUALIFIER/NONE] => 9
+ [CallStack]
+reindent_line : orig line is 14, orig col is 1, on 'unsigned' [TYPE/NONE] => 9
+ [CallStack]
+reindent_line : orig line is 15, orig col is 1, on '}' [BRACE_CLOSE/STRUCT] => 1
+ [CallStack]
 indent_text : after quick_align_again
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/36.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/36.txt
index ed6495d5..ed6495d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/36.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/36.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/66.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/66.txt
index 237507e0..7ce67542 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/66.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/66.txt
@@ -1,34 +1,34 @@
 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 : orig line 1, orig col 1, first text 'struct', type STRUCT
 do_space : first orig line is 1, orig col is 1, Text() is 'struct', [STRUCT/NONE] <===>
-           second orig line is 1, orig col is 8, Text() is 'TelegramIndex', [TYPE/STRUCT] : rule ADD from add_space_table[ ]
-ensure_force_space : <force between 'struct' and 'TelegramIndex'>
+           second orig line is 1, orig col is 8, Text() is 'TelegramIndex', [TYPE/STRUCT] : rule ADD from add_space_table @ 236.[ ]
+ensure_force_space : force between 'struct' and 'TelegramIndex'
 space_text : orig line is 1, orig col is 1, pc-Text() 'struct', type is STRUCT
 space_text :    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
+do_space : orig line 1, orig col 8, first text 'TelegramIndex', type TYPE
 space_text : orig line is 1, orig col is 8, pc-Text() 'TelegramIndex', type is TYPE
 space_text :    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
+do_space : orig line 2, orig col 1, first text '{', type BRACE_OPEN
 space_text : orig line is 2, orig col is 1, pc-Text() '{', type is BRACE_OPEN
 space_text :    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 : orig line 3, orig col 1, first text 'TelegramIndex', type FUNC_CLASS_DEF
 do_space : first orig line is 3, orig col is 1, Text() is 'TelegramIndex', [FUNC_CLASS_DEF/NONE] <===>
            second orig line is 3, orig col is 14, Text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[ ]
 space_text : orig line is 3, orig col is 1, pc-Text() 'TelegramIndex', type is FUNC_CLASS_DEF
 space_text :    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 : orig line 3, orig col 14, first text '(', type FPAREN_OPEN
 do_space : first orig line is 3, orig col is 14, Text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===>
            second orig line is 3, orig col is 15, Text() is 'const', [QUALIFIER/NONE] : rule sp_inside_fparen[ ]
 space_text : orig line is 3, orig col is 14, pc-Text() '(', type is FPAREN_OPEN
@@ -36,36 +36,36 @@ space_text :    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 : orig line 3, orig col 15, first text 'const', type QUALIFIER
 do_space : first orig line is 3, orig col is 15, Text() is 'const', [QUALIFIER/NONE] <===>
            second orig line is 3, orig col is 21, Text() is 'char', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'const' and 'char'>
+ensure_force_space : force between 'const' and 'char'
 space_text : orig line is 3, orig col is 15, pc-Text() 'const', type is QUALIFIER
 space_text :    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 : orig line 3, orig col 21, first text 'char', type TYPE
 do_space : first orig line is 3, orig col is 21, Text() is 'char', [TYPE/NONE] <===>
            second orig line is 3, orig col is 25, Text() is '*', [PTR_TYPE/NONE] : rule IGNORE[ ]
 space_text : orig line is 3, orig col is 21, pc-Text() 'char', type is TYPE
 space_text :    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 : orig line 3, orig col 25, first text '*', type PTR_TYPE
 do_space : first orig line is 3, orig col is 25, Text() is '*', [PTR_TYPE/NONE] <===>
            second orig line is 3, orig col is 27, Text() is 'pN', [WORD/NONE] : rule sp_after_ptr_star[ ]
 space_text : orig line is 3, orig col is 25, pc-Text() '*', type is PTR_TYPE
 space_text :    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 : orig line 3, orig col 27, first text 'pN', type WORD
 do_space : first orig line is 3, orig col is 27, Text() is 'pN', [WORD/NONE] <===>
            second orig line is 3, orig col is 29, Text() is ',', [COMMA/NONE] : rule sp_before_comma[ ]
 space_text : orig line is 3, orig col is 27, pc-Text() 'pN', type is WORD
 space_text :    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 : orig line 3, orig col 29, first text ',', type COMMA
 do_space : first orig line is 3, orig col is 29, Text() is ',', [COMMA/NONE] <===>
            second orig line is 3, orig col is 31, Text() is 'unsigned', [TYPE/NONE] : rule sp_after_comma[ ]
 space_text : orig line is 3, orig col is 29, pc-Text() ',', type is COMMA
@@ -73,172 +73,172 @@ space_text :    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 : orig line 3, orig col 31, first text 'unsigned', type TYPE
 do_space : first orig line is 3, orig col is 31, Text() is 'unsigned', [TYPE/NONE] <===>
            second orig line is 3, orig col is 40, Text() is 'long', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'unsigned' and 'long'>
+ensure_force_space : force between 'unsigned' and 'long'
 space_text : orig line is 3, orig col is 31, pc-Text() 'unsigned', type is TYPE
 space_text :    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 : orig line 3, orig col 40, first text 'long', type TYPE
 do_space : first orig line is 3, orig col is 40, Text() is 'long', [TYPE/NONE] <===>
            second orig line is 3, orig col is 45, Text() is 'nI', [WORD/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'long' and 'nI'>
+ensure_force_space : force between 'long' and 'nI'
 space_text : orig line is 3, orig col is 40, pc-Text() 'long', type is TYPE
 space_text :    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 : orig line 3, orig col 45, first text 'nI', type WORD
 do_space : first orig line is 3, orig col is 45, Text() is 'nI', [WORD/NONE] <===>
            second orig line is 3, orig col is 47, Text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparen[ ]
 space_text : orig line is 3, orig col is 45, pc-Text() 'nI', type is WORD
 space_text :    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 : orig line 3, orig col 47, first text ')', type FPAREN_CLOSE
 do_space : first orig line is 3, orig col is 47, Text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] <===>
            second orig line is 3, orig col is 49, Text() is ':', [CONSTR_COLON/NONE] : rule sp_before_constr_colon[ ]
 space_text : orig line is 3, orig col is 47, pc-Text() ')', type is FPAREN_CLOSE
 space_text :    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
+do_space : orig line 3, orig col 49, first text ':', type CONSTR_COLON
 space_text : orig line is 3, orig col is 49, pc-Text() ':', type is CONSTR_COLON
 space_text :    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 : orig line 4, orig col 1, first text 'pTelName', type FUNC_CTOR_VAR
 do_space : first orig line is 4, orig col is 1, Text() is 'pTelName', [FUNC_CTOR_VAR/NONE] <===>
            second orig line is 4, orig col is 9, Text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[ ]
 space_text : orig line is 4, orig col is 1, pc-Text() 'pTelName', type is FUNC_CTOR_VAR
 space_text :    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 : orig line 4, orig col 9, first text '(', type FPAREN_OPEN
 do_space : first orig line is 4, orig col is 9, Text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===>
            second orig line is 4, orig col is 10, Text() is 'pN', [WORD/NONE] : rule sp_inside_fparen[ ]
 space_text : orig line is 4, orig col is 9, pc-Text() '(', type is FPAREN_OPEN
 space_text :    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 : orig line 4, orig col 10, first text 'pN', type WORD
 do_space : first orig line is 4, orig col is 10, Text() is 'pN', [WORD/NONE] <===>
            second orig line is 4, orig col is 12, Text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[ ]
 space_text : orig line is 4, orig col is 10, pc-Text() 'pN', type is WORD
 space_text :    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 : orig line 4, orig col 12, first text ')', type FPAREN_CLOSE
 do_space : first orig line is 4, orig col is 12, Text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] <===>
            second orig line is 4, orig col is 13, Text() is ',', [COMMA/NONE] : rule sp_before_comma[ ]
 space_text : orig line is 4, orig col is 12, pc-Text() ')', type is FPAREN_CLOSE
 space_text :    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
+do_space : orig line 4, orig col 13, first text ',', type COMMA
 space_text : orig line is 4, orig col is 13, pc-Text() ',', type is COMMA
 space_text :    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 : orig line 5, orig col 1, first text 'nTelIndex', type FUNC_CTOR_VAR
 do_space : first orig line is 5, orig col is 1, Text() is 'nTelIndex', [FUNC_CTOR_VAR/NONE] <===>
            second orig line is 5, orig col is 10, Text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] : rule sp_func_call_paren[ ]
 space_text : orig line is 5, orig col is 1, pc-Text() 'nTelIndex', type is FUNC_CTOR_VAR
 space_text :    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 : orig line 5, orig col 10, first text '(', type FPAREN_OPEN
 do_space : first orig line is 5, orig col is 10, Text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===>
            second orig line is 5, orig col is 11, Text() is 'n', [WORD/NONE] : rule sp_inside_fparen[ ]
 space_text : orig line is 5, orig col is 10, pc-Text() '(', type is FPAREN_OPEN
 space_text :    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 : orig line 5, orig col 11, first text 'n', type WORD
 do_space : first orig line is 5, orig col is 11, Text() is 'n', [WORD/NONE] <===>
            second orig line is 5, orig col is 12, Text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] : rule sp_inside_fparen[ ]
 space_text : orig line is 5, orig col is 11, pc-Text() 'n', type is WORD
 space_text :    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
+do_space : orig line 5, orig col 12, first text ')', type FPAREN_CLOSE
 space_text : orig line is 5, orig col is 12, pc-Text() ')', type is FPAREN_CLOSE
 space_text :    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
+do_space : orig line 6, orig col 1, first text '{', type BRACE_OPEN
 space_text : orig line is 6, orig col is 1, pc-Text() '{', type is BRACE_OPEN
 space_text :    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
+do_space : orig line 7, orig col 1, first text '}', type BRACE_CLOSE
 space_text : orig line is 7, orig col is 1, pc-Text() '}', type is BRACE_CLOSE
 space_text :    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 : orig line 9, orig col 1, first text '~', type DESTRUCTOR
 do_space : first orig line is 9, orig col is 1, Text() is '~', [DESTRUCTOR/FUNC_CLASS_DEF] <===>
            second orig line is 9, orig col is 2, Text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] : rule REMOVE[ ]
 space_text : orig line is 9, orig col is 1, pc-Text() '~', type is DESTRUCTOR
 space_text :    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 : orig line 9, orig col 2, first text 'TelegramIndex', type FUNC_CLASS_DEF
 do_space : first orig line is 9, orig col is 2, Text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] <===>
            second orig line is 9, orig col is 15, Text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] : rule sp_func_class_paren[ ]
 space_text : orig line is 9, orig col is 2, pc-Text() 'TelegramIndex', type is FUNC_CLASS_DEF
 space_text :    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 : orig line 9, orig col 15, first text '(', type FPAREN_OPEN
 do_space : first orig line is 9, orig col is 15, Text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===>
            second orig line is 9, orig col is 16, Text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] : rule sp_inside_fparens[ ]
 space_text : orig line is 9, orig col is 15, pc-Text() '(', type is FPAREN_OPEN
 space_text :    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
+do_space : orig line 9, orig col 16, first text ')', type FPAREN_CLOSE
 space_text : orig line is 9, orig col is 16, pc-Text() ')', type is FPAREN_CLOSE
 space_text :    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
+do_space : orig line 10, orig col 1, first text '{', type BRACE_OPEN
 space_text : orig line is 10, orig col is 1, pc-Text() '{', type is BRACE_OPEN
 space_text :    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
+do_space : orig line 11, orig col 1, first text '}', type BRACE_CLOSE
 space_text : orig line is 11, orig col is 1, pc-Text() '}', type is BRACE_CLOSE
 space_text :    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 : orig line 13, orig col 1, first text 'const', type QUALIFIER
 do_space : first orig line is 13, orig col is 1, Text() is 'const', [QUALIFIER/NONE] <===>
            second orig line is 13, orig col is 7, Text() is 'char', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'const' and 'char'>
+ensure_force_space : force between 'const' and 'char'
 space_text : orig line is 13, orig col is 1, pc-Text() 'const', type is QUALIFIER
 space_text :    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 : orig line 13, orig col 7, first text 'char', type TYPE
 do_space : first orig line is 13, orig col is 7, Text() is 'char', [TYPE/NONE] <===>
            second orig line is 13, orig col is 11, Text() is '*', [PTR_TYPE/NONE] : rule IGNORE[ ]
 space_text : orig line is 13, orig col is 7, pc-Text() 'char', type is TYPE
 space_text :    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 : orig line 13, orig col 11, first text '*', type PTR_TYPE
 do_space : first orig line is 13, orig col is 11, Text() is '*', [PTR_TYPE/NONE] <===>
            second orig line is 13, orig col is 13, Text() is 'const', [QUALIFIER/NONE] : rule sp_after_ptr_star_qualifier[ ]
 space_text : orig line is 13, orig col is 11, pc-Text() '*', type is PTR_TYPE
@@ -246,555 +246,594 @@ space_text :    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 : orig line 13, orig col 13, first text 'const', type QUALIFIER
 do_space : first orig line is 13, orig col is 13, Text() is 'const', [QUALIFIER/NONE] <===>
            second orig line is 13, orig col is 19, Text() is 'pTelName', [WORD/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'const' and 'pTelName'>
+ensure_force_space : force between 'const' and 'pTelName'
 space_text : orig line is 13, orig col is 13, pc-Text() 'const', type is QUALIFIER
 space_text :    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 : orig line 13, orig col 19, first text 'pTelName', type WORD
 do_space : first orig line is 13, orig col is 19, Text() is 'pTelName', [WORD/NONE] <===>
            second orig line is 13, orig col is 27, Text() is ';', [SEMICOLON/NONE] : rule sp_before_semi[ ]
 space_text : orig line is 13, orig col is 19, pc-Text() 'pTelName', type is WORD
 space_text :    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
+do_space : orig line 13, orig col 27, first text ';', type SEMICOLON
 space_text : orig line is 13, orig col is 27, pc-Text() ';', type is SEMICOLON
 space_text :    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 : orig line 14, orig col 1, first text 'unsigned', type TYPE
 do_space : first orig line is 14, orig col is 1, Text() is 'unsigned', [TYPE/NONE] <===>
            second orig line is 14, orig col is 10, Text() is 'long', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'unsigned' and 'long'>
+ensure_force_space : force between 'unsigned' and 'long'
 space_text : orig line is 14, orig col is 1, pc-Text() 'unsigned', type is TYPE
 space_text :    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 : orig line 14, orig col 10, first text 'long', type TYPE
 do_space : first orig line is 14, orig col is 10, Text() is 'long', [TYPE/NONE] <===>
            second orig line is 14, orig col is 15, Text() is 'nTelIndex', [WORD/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'long' and 'nTelIndex'>
+ensure_force_space : force between 'long' and 'nTelIndex'
 space_text : orig line is 14, orig col is 10, pc-Text() 'long', type is TYPE
 space_text :    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 : orig line 14, orig col 15, first text 'nTelIndex', type WORD
 do_space : first orig line is 14, orig col is 15, Text() is 'nTelIndex', [WORD/NONE] <===>
            second orig line is 14, orig col is 24, Text() is ';', [SEMICOLON/NONE] : rule sp_before_semi[ ]
 space_text : orig line is 14, orig col is 15, pc-Text() 'nTelIndex', type is WORD
 space_text :    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
+do_space : orig line 14, orig col 24, first text ';', type SEMICOLON
 space_text : orig line is 14, orig col is 24, pc-Text() ';', type is SEMICOLON
 space_text :    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 : orig line 15, orig col 1, first text '}', type BRACE_CLOSE
 do_space : first orig line is 15, orig col is 1, Text() is '}', [BRACE_CLOSE/STRUCT] <===>
            second orig line is 15, orig col is 2, Text() is ';', [SEMICOLON/STRUCT] : rule sp_before_semi[ ]
 space_text : orig line is 15, orig col is 1, pc-Text() '}', type is BRACE_CLOSE
 space_text :    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
+do_space : orig line 15, orig col 2, first text ';', type SEMICOLON
 space_text : orig line is 15, orig col is 2, pc-Text() ';', type is SEMICOLON
 space_text :    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
+space_col_align : 1st orig line 3, orig col 1, [FUNC_CLASS_DEF/NONE], text 'TelegramIndex' <==>
+space_col_align : 2nd orig line 3, orig col 14, [FPAREN_OPEN/FUNC_CLASS_DEF], text '('
+ [CallStack]
+do_space : orig line 3, orig col 1, first text 'TelegramIndex', type FUNC_CLASS_DEF
 do_space : first orig line is 3, orig col is 1, Text() is 'TelegramIndex', [FUNC_CLASS_DEF/NONE] <===>
            second orig line is 3, orig col is 14, 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 :    '1st' 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 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 :    => 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
+space_col_align : 1st orig line 3, orig col 14, [FPAREN_OPEN/FUNC_CLASS_DEF], text '(' <==>
+space_col_align : 2nd orig line 3, orig col 15, [QUALIFIER/NONE], text 'const'
+ [CallStack]
+do_space : orig line 3, orig col 14, first text '(', type FPAREN_OPEN
 do_space : first orig line is 3, orig col is 14, Text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===>
            second orig line is 3, orig col is 15, Text() is 'const', [QUALIFIER/NONE] : rule sp_inside_fparen[ ]
 space_col_align : av is ignore
-space_col_align :    Len is 1
+space_col_align :    '1st' 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 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 :    => 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
+space_col_align : 1st orig line 3, orig col 15, [QUALIFIER/NONE], text 'const' <==>
+space_col_align : 2nd orig line 3, orig col 21, [TYPE/NONE], text 'char'
+ [CallStack]
+do_space : orig line 3, orig col 15, first text 'const', type QUALIFIER
 do_space : first orig line is 3, orig col is 15, Text() is 'const', [QUALIFIER/NONE] <===>
            second orig line is 3, orig col is 21, Text() is 'char', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'const' and 'char'>
+ensure_force_space : force between 'const' and 'char'
 space_col_align : av is force
-space_col_align :    Len is 5
+space_col_align :    '1st' 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
+space_col_align : 1st orig line 3, orig col 21, [TYPE/NONE], text 'char' <==>
+space_col_align : 2nd orig line 3, orig col 25, [PTR_TYPE/NONE], text '*'
+ [CallStack]
+do_space : orig line 3, orig col 21, first text 'char', type TYPE
 do_space : first orig line is 3, orig col is 21, Text() is 'char', [TYPE/NONE] <===>
            second orig line is 3, orig col is 25, Text() is '*', [PTR_TYPE/NONE] : rule IGNORE[ ]
 space_col_align : av is ignore
-space_col_align :    Len is 4
+space_col_align :    '1st' 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 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 :    => 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
+space_col_align : 1st orig line 3, orig col 25, [PTR_TYPE/NONE], text '*' <==>
+space_col_align : 2nd orig line 3, orig col 27, [WORD/NONE], text 'pN'
+ [CallStack]
+do_space : orig line 3, orig col 25, first text '*', type PTR_TYPE
 do_space : first orig line is 3, orig col is 25, Text() is '*', [PTR_TYPE/NONE] <===>
            second orig line is 3, orig col is 27, Text() is 'pN', [WORD/NONE] : rule sp_after_ptr_star[ ]
 space_col_align : av is ignore
-space_col_align :    Len is 1
+space_col_align :    '1st' 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 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 :    => 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
+space_col_align : 1st orig line 3, orig col 27, [WORD/NONE], text 'pN' <==>
+space_col_align : 2nd orig line 3, orig col 29, [COMMA/NONE], text ','
+ [CallStack]
+do_space : orig line 3, orig col 27, first text 'pN', type WORD
 do_space : first orig line is 3, orig col is 27, Text() is 'pN', [WORD/NONE] <===>
            second orig line is 3, orig col is 29, Text() is ',', [COMMA/NONE] : rule sp_before_comma[ ]
 space_col_align : av is remove
-space_col_align :    Len is 2
+space_col_align :    '1st' 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
+space_col_align : 1st orig line 3, orig col 29, [COMMA/NONE], text ',' <==>
+space_col_align : 2nd orig line 3, orig col 31, [TYPE/NONE], text 'unsigned'
+ [CallStack]
+do_space : orig line 3, orig col 29, first text ',', type COMMA
 do_space : first orig line is 3, orig col is 29, Text() is ',', [COMMA/NONE] <===>
            second orig line is 3, orig col is 31, Text() is 'unsigned', [TYPE/NONE] : rule sp_after_comma[ ]
 space_col_align : av is ignore
-space_col_align :    Len is 1
+space_col_align :    '1st' 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 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 :    => 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
+space_col_align : 1st orig line 3, orig col 31, [TYPE/NONE], text 'unsigned' <==>
+space_col_align : 2nd orig line 3, orig col 40, [TYPE/NONE], text 'long'
+ [CallStack]
+do_space : orig line 3, orig col 31, first text 'unsigned', type TYPE
 do_space : first orig line is 3, orig col is 31, Text() is 'unsigned', [TYPE/NONE] <===>
            second orig line is 3, orig col is 40, Text() is 'long', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'unsigned' and 'long'>
+ensure_force_space : force between 'unsigned' and 'long'
 space_col_align : av is force
-space_col_align :    Len is 8
+space_col_align :    '1st' 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
+space_col_align : 1st orig line 3, orig col 40, [TYPE/NONE], text 'long' <==>
+space_col_align : 2nd orig line 3, orig col 45, [WORD/NONE], text 'nI'
+ [CallStack]
+do_space : orig line 3, orig col 40, first text 'long', type TYPE
 do_space : first orig line is 3, orig col is 40, Text() is 'long', [TYPE/NONE] <===>
            second orig line is 3, orig col is 45, Text() is 'nI', [WORD/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'long' and 'nI'>
+ensure_force_space : force between 'long' and 'nI'
 space_col_align : av is force
-space_col_align :    Len is 4
+space_col_align :    '1st' 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
+space_col_align : 1st orig line 3, orig col 45, [WORD/NONE], text 'nI' <==>
+space_col_align : 2nd orig line 3, orig col 47, [FPAREN_CLOSE/FUNC_CLASS_DEF], text ')'
+ [CallStack]
+do_space : orig line 3, orig col 45, first text 'nI', type WORD
 do_space : first orig line is 3, orig col is 45, Text() is 'nI', [WORD/NONE] <===>
            second orig line is 3, orig col is 47, 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 :    '1st' 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 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 :    => 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
+space_col_align : 1st orig line 3, orig col 47, [FPAREN_CLOSE/FUNC_CLASS_DEF], text ')' <==>
+space_col_align : 2nd orig line 3, orig col 49, [CONSTR_COLON/NONE], text ':'
+ [CallStack]
+do_space : orig line 3, orig col 47, first text ')', type FPAREN_CLOSE
 do_space : first orig line is 3, orig col is 47, Text() is ')', [FPAREN_CLOSE/FUNC_CLASS_DEF] <===>
            second orig line is 3, orig col is 49, Text() is ':', [CONSTR_COLON/NONE] : rule sp_before_constr_colon[ ]
 space_col_align : av is add
-space_col_align :    Len is 1
+space_col_align :    '1st' 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 : 1st orig line 3, orig col 49, [CONSTR_COLON/NONE], text ':' <==>
+space_col_align : 2nd orig line 3, orig col 50, [NEWLINE/NONE], text ''
+ [CallStack]
+do_space : orig line 3, orig col 49, first text ':', type CONSTR_COLON
 space_col_align : av is remove
-space_col_align :    Len is 1
+space_col_align :    '1st' 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
+space_col_align : 1st orig line 4, orig col 1, [FUNC_CTOR_VAR/NONE], text 'pTelName' <==>
+space_col_align : 2nd orig line 4, orig col 9, [FPAREN_OPEN/FUNC_CTOR_VAR], text '('
+ [CallStack]
+do_space : orig line 4, orig col 1, first text 'pTelName', type FUNC_CTOR_VAR
 do_space : first orig line is 4, orig col is 1, Text() is 'pTelName', [FUNC_CTOR_VAR/NONE] <===>
            second orig line is 4, orig col is 9, 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 :    '1st' 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 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 :    => 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
+space_col_align : 1st orig line 4, orig col 9, [FPAREN_OPEN/FUNC_CTOR_VAR], text '(' <==>
+space_col_align : 2nd orig line 4, orig col 10, [WORD/NONE], text 'pN'
+ [CallStack]
+do_space : orig line 4, orig col 9, first text '(', type FPAREN_OPEN
 do_space : first orig line is 4, orig col is 9, Text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===>
            second orig line is 4, orig col is 10, Text() is 'pN', [WORD/NONE] : rule sp_inside_fparen[ ]
 space_col_align : av is ignore
-space_col_align :    Len is 1
+space_col_align :    '1st' 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 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 :    => 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
+space_col_align : 1st orig line 4, orig col 10, [WORD/NONE], text 'pN' <==>
+space_col_align : 2nd orig line 4, orig col 12, [FPAREN_CLOSE/FUNC_CTOR_VAR], text ')'
+ [CallStack]
+do_space : orig line 4, orig col 10, first text 'pN', type WORD
 do_space : first orig line is 4, orig col is 10, Text() is 'pN', [WORD/NONE] <===>
            second orig line is 4, orig col is 12, 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 :    '1st' 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 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 :    => 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
+space_col_align : 1st orig line 4, orig col 12, [FPAREN_CLOSE/FUNC_CTOR_VAR], text ')' <==>
+space_col_align : 2nd orig line 4, orig col 13, [COMMA/NONE], text ','
+ [CallStack]
+do_space : orig line 4, orig col 12, first text ')', type FPAREN_CLOSE
 do_space : first orig line is 4, orig col is 12, Text() is ')', [FPAREN_CLOSE/FUNC_CTOR_VAR] <===>
            second orig line is 4, orig col is 13, Text() is ',', [COMMA/NONE] : rule sp_before_comma[ ]
 space_col_align : av is remove
-space_col_align :    Len is 1
+space_col_align :    '1st' 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 : 1st orig line 4, orig col 13, [COMMA/NONE], text ',' <==>
+space_col_align : 2nd orig line 4, orig col 14, [NEWLINE/NONE], text ''
+ [CallStack]
+do_space : orig line 4, orig col 13, first text ',', type COMMA
 space_col_align : av is remove
-space_col_align :    Len is 1
+space_col_align :    '1st' 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
+space_col_align : 1st orig line 5, orig col 1, [FUNC_CTOR_VAR/NONE], text 'nTelIndex' <==>
+space_col_align : 2nd orig line 5, orig col 10, [FPAREN_OPEN/FUNC_CTOR_VAR], text '('
+ [CallStack]
+do_space : orig line 5, orig col 1, first text 'nTelIndex', type FUNC_CTOR_VAR
 do_space : first orig line is 5, orig col is 1, Text() is 'nTelIndex', [FUNC_CTOR_VAR/NONE] <===>
            second orig line is 5, orig col is 10, 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 :    '1st' 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 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 :    => 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
+space_col_align : 1st orig line 5, orig col 10, [FPAREN_OPEN/FUNC_CTOR_VAR], text '(' <==>
+space_col_align : 2nd orig line 5, orig col 11, [WORD/NONE], text 'n'
+ [CallStack]
+do_space : orig line 5, orig col 10, first text '(', type FPAREN_OPEN
 do_space : first orig line is 5, orig col is 10, Text() is '(', [FPAREN_OPEN/FUNC_CTOR_VAR] <===>
            second orig line is 5, orig col is 11, Text() is 'n', [WORD/NONE] : rule sp_inside_fparen[ ]
 space_col_align : av is ignore
-space_col_align :    Len is 1
+space_col_align :    '1st' 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 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 :    => 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
+space_col_align : 1st orig line 5, orig col 11, [WORD/NONE], text 'n' <==>
+space_col_align : 2nd orig line 5, orig col 12, [FPAREN_CLOSE/FUNC_CTOR_VAR], text ')'
+ [CallStack]
+do_space : orig line 5, orig col 11, first text 'n', type WORD
 do_space : first orig line is 5, orig col is 11, Text() is 'n', [WORD/NONE] <===>
            second orig line is 5, orig col is 12, 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 :    '1st' 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 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 :    => 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 : 1st orig line 5, orig col 12, [FPAREN_CLOSE/FUNC_CTOR_VAR], text ')' <==>
+space_col_align : 2nd orig line 5, orig col 13, [NEWLINE/NONE], text ''
+ [CallStack]
+do_space : orig line 5, orig col 12, first text ')', type FPAREN_CLOSE
 space_col_align : av is remove
-space_col_align :    Len is 1
+space_col_align :    '1st' 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 : 1st orig line 6, orig col 1, [BRACE_OPEN/FUNC_CLASS_DEF], text '{' <==>
+space_col_align : 2nd orig line 6, orig col 2, [NEWLINE/NONE], text ''
+ [CallStack]
+do_space : orig line 6, orig col 1, first text '{', type BRACE_OPEN
 space_col_align : av is remove
-space_col_align :    Len is 1
+space_col_align :    '1st' 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 : 1st orig line 7, orig col 1, [BRACE_CLOSE/FUNC_CLASS_DEF], text '}' <==>
+space_col_align : 2nd orig line 7, orig col 2, [NEWLINE/NONE], text ''
+ [CallStack]
+do_space : orig line 7, orig col 1, first text '}', type BRACE_CLOSE
 space_col_align : av is remove
-space_col_align :    Len is 1
+space_col_align :    '1st' 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
+space_col_align : 1st orig line 9, orig col 1, [DESTRUCTOR/FUNC_CLASS_DEF], text '~' <==>
+space_col_align : 2nd orig line 9, orig col 2, [FUNC_CLASS_DEF/DESTRUCTOR], text 'TelegramIndex'
+ [CallStack]
+do_space : orig line 9, orig col 1, first text '~', type DESTRUCTOR
 do_space : first orig line is 9, orig col is 1, Text() is '~', [DESTRUCTOR/FUNC_CLASS_DEF] <===>
            second orig line is 9, orig col is 2, Text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] : rule REMOVE[ ]
 space_col_align : av is remove
-space_col_align :    Len is 1
+space_col_align :    '1st' 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
+space_col_align : 1st orig line 9, orig col 2, [FUNC_CLASS_DEF/DESTRUCTOR], text 'TelegramIndex' <==>
+space_col_align : 2nd orig line 9, orig col 15, [FPAREN_OPEN/FUNC_CLASS_DEF], text '('
+ [CallStack]
+do_space : orig line 9, orig col 2, first text 'TelegramIndex', type FUNC_CLASS_DEF
 do_space : first orig line is 9, orig col is 2, Text() is 'TelegramIndex', [FUNC_CLASS_DEF/DESTRUCTOR] <===>
            second orig line is 9, orig col is 15, 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 :    '1st' 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 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 :    => 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
+space_col_align : 1st orig line 9, orig col 15, [FPAREN_OPEN/FUNC_CLASS_DEF], text '(' <==>
+space_col_align : 2nd orig line 9, orig col 16, [FPAREN_CLOSE/FUNC_CLASS_DEF], text ')'
+ [CallStack]
+do_space : orig line 9, orig col 15, first text '(', type FPAREN_OPEN
 do_space : first orig line is 9, orig col is 15, Text() is '(', [FPAREN_OPEN/FUNC_CLASS_DEF] <===>
            second orig line is 9, orig col is 16, 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 :    '1st' 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 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 :    => 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 : 1st orig line 9, orig col 16, [FPAREN_CLOSE/FUNC_CLASS_DEF], text ')' <==>
+space_col_align : 2nd orig line 9, orig col 17, [NEWLINE/NONE], text ''
+ [CallStack]
+do_space : orig line 9, orig col 16, first text ')', type FPAREN_CLOSE
 space_col_align : av is remove
-space_col_align :    Len is 1
+space_col_align :    '1st' 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 : 1st orig line 10, orig col 1, [BRACE_OPEN/FUNC_CLASS_DEF], text '{' <==>
+space_col_align : 2nd orig line 10, orig col 2, [NEWLINE/NONE], text ''
+ [CallStack]
+do_space : orig line 10, orig col 1, first text '{', type BRACE_OPEN
 space_col_align : av is remove
-space_col_align :    Len is 1
+space_col_align :    '1st' 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 : 1st orig line 11, orig col 1, [BRACE_CLOSE/FUNC_CLASS_DEF], text '}' <==>
+space_col_align : 2nd orig line 11, orig col 2, [NEWLINE/NONE], text ''
+ [CallStack]
+do_space : orig line 11, orig col 1, first text '}', type BRACE_CLOSE
 space_col_align : av is remove
-space_col_align :    Len is 1
+space_col_align :    '1st' 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
+space_col_align : 1st orig line 13, orig col 1, [QUALIFIER/NONE], text 'const' <==>
+space_col_align : 2nd orig line 13, orig col 7, [TYPE/NONE], text 'char'
+ [CallStack]
+do_space : orig line 13, orig col 1, first text 'const', type QUALIFIER
 do_space : first orig line is 13, orig col is 1, Text() is 'const', [QUALIFIER/NONE] <===>
            second orig line is 13, orig col is 7, Text() is 'char', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'const' and 'char'>
+ensure_force_space : force between 'const' and 'char'
 space_col_align : av is force
-space_col_align :    Len is 5
+space_col_align :    '1st' 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
+space_col_align : 1st orig line 13, orig col 7, [TYPE/NONE], text 'char' <==>
+space_col_align : 2nd orig line 13, orig col 11, [PTR_TYPE/NONE], text '*'
+ [CallStack]
+do_space : orig line 13, orig col 7, first text 'char', type TYPE
 do_space : first orig line is 13, orig col is 7, Text() is 'char', [TYPE/NONE] <===>
            second orig line is 13, orig col is 11, Text() is '*', [PTR_TYPE/NONE] : rule IGNORE[ ]
 space_col_align : av is ignore
-space_col_align :    Len is 4
+space_col_align :    '1st' 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 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 :    => 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
+space_col_align : 1st orig line 13, orig col 11, [PTR_TYPE/NONE], text '*' <==>
+space_col_align : 2nd orig line 13, orig col 13, [QUALIFIER/NONE], text 'const'
+ [CallStack]
+do_space : orig line 13, orig col 11, first text '*', type PTR_TYPE
 do_space : first orig line is 13, orig col is 11, Text() is '*', [PTR_TYPE/NONE] <===>
            second orig line is 13, orig col is 13, Text() is 'const', [QUALIFIER/NONE] : rule sp_after_ptr_star_qualifier[ ]
 space_col_align : av is ignore
-space_col_align :    Len is 1
+space_col_align :    '1st' 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 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 :    => 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
+space_col_align : 1st orig line 13, orig col 13, [QUALIFIER/NONE], text 'const' <==>
+space_col_align : 2nd orig line 13, orig col 19, [WORD/NONE], text 'pTelName'
+ [CallStack]
+do_space : orig line 13, orig col 13, first text 'const', type QUALIFIER
 do_space : first orig line is 13, orig col is 13, Text() is 'const', [QUALIFIER/NONE] <===>
            second orig line is 13, orig col is 19, Text() is 'pTelName', [WORD/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'const' and 'pTelName'>
+ensure_force_space : force between 'const' and 'pTelName'
 space_col_align : av is force
-space_col_align :    Len is 5
+space_col_align :    '1st' 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
+space_col_align : 1st orig line 13, orig col 19, [WORD/NONE], text 'pTelName' <==>
+space_col_align : 2nd orig line 13, orig col 27, [SEMICOLON/NONE], text ';'
+ [CallStack]
+do_space : orig line 13, orig col 19, first text 'pTelName', type WORD
 do_space : first orig line is 13, orig col is 19, Text() is 'pTelName', [WORD/NONE] <===>
            second orig line is 13, orig col is 27, Text() is ';', [SEMICOLON/NONE] : rule sp_before_semi[ ]
 space_col_align : av is remove
-space_col_align :    Len is 8
+space_col_align :    '1st' 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 : 1st orig line 13, orig col 27, [SEMICOLON/NONE], text ';' <==>
+space_col_align : 2nd orig line 13, orig col 28, [NEWLINE/NONE], text ''
+ [CallStack]
+do_space : orig line 13, orig col 27, first text ';', type SEMICOLON
 space_col_align : av is remove
-space_col_align :    Len is 1
+space_col_align :    '1st' 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
+space_col_align : 1st orig line 14, orig col 1, [TYPE/NONE], text 'unsigned' <==>
+space_col_align : 2nd orig line 14, orig col 10, [TYPE/NONE], text 'long'
+ [CallStack]
+do_space : orig line 14, orig col 1, first text 'unsigned', type TYPE
 do_space : first orig line is 14, orig col is 1, Text() is 'unsigned', [TYPE/NONE] <===>
            second orig line is 14, orig col is 10, Text() is 'long', [TYPE/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'unsigned' and 'long'>
+ensure_force_space : force between 'unsigned' and 'long'
 space_col_align : av is force
-space_col_align :    Len is 8
+space_col_align :    '1st' 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
+space_col_align : 1st orig line 14, orig col 10, [TYPE/NONE], text 'long' <==>
+space_col_align : 2nd orig line 14, orig col 15, [WORD/NONE], text 'nTelIndex'
+ [CallStack]
+do_space : orig line 14, orig col 10, first text 'long', type TYPE
 do_space : first orig line is 14, orig col is 10, Text() is 'long', [TYPE/NONE] <===>
            second orig line is 14, orig col is 15, Text() is 'nTelIndex', [WORD/NONE] : rule sp_after_type[ ]
-ensure_force_space : <force between 'long' and 'nTelIndex'>
+ensure_force_space : force between 'long' and 'nTelIndex'
 space_col_align : av is force
-space_col_align :    Len is 4
+space_col_align :    '1st' 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
+space_col_align : 1st orig line 14, orig col 15, [WORD/NONE], text 'nTelIndex' <==>
+space_col_align : 2nd orig line 14, orig col 24, [SEMICOLON/NONE], text ';'
+ [CallStack]
+do_space : orig line 14, orig col 15, first text 'nTelIndex', type WORD
 do_space : first orig line is 14, orig col is 15, Text() is 'nTelIndex', [WORD/NONE] <===>
            second orig line is 14, orig col is 24, Text() is ';', [SEMICOLON/NONE] : rule sp_before_semi[ ]
 space_col_align : av is remove
-space_col_align :    Len is 9
+space_col_align :    '1st' 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 : 1st orig line 14, orig col 24, [SEMICOLON/NONE], text ';' <==>
+space_col_align : 2nd orig line 14, orig col 25, [NEWLINE/NONE], text ''
+ [CallStack]
+do_space : orig line 14, orig col 24, first text ';', type SEMICOLON
 space_col_align : av is remove
-space_col_align :    Len is 1
+space_col_align :    '1st' 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.76.0/tests/cli/output/9.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/9.txt
index 98afe921..98afe921 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/9.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/9.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/92.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/92.txt
new file mode 100644
index 00000000..f0690328
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/92.txt
@@ -0,0 +1,196 @@
+SetType : orig line is 1, orig col is 1, Text() is 'struct'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 1, orig col is 1, Text() is 'struct'
+   type is WORD, parent type is NONE => new type is STRUCT
+SetType : orig line is 1, orig col is 7, Text() is ''
+   type is NONE, parent type is NONE => new type is WHITESPACE
+SetType : orig line is 1, orig col is 8, Text() is 'TelegramIndex'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 1, orig col is 21, Text() is <Newline>
+   type is NONE, parent type is NONE => new type is NEWLINE
+SetType : orig line is 2, orig col is 1, Text() is '{'
+   type is NONE, parent type is NONE => new type is BRACE_OPEN
+SetType : orig line is 2, orig col is 2, Text() is <Newline>
+   type is NONE, parent type is NONE => new type is NEWLINE
+SetType : orig line is 3, orig col is 1, Text() is 'TelegramIndex'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 3, orig col is 14, Text() is '('
+   type is NONE, parent type is NONE => new type is PAREN_OPEN
+SetType : orig line is 3, orig col is 15, Text() is 'const'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 3, orig col is 15, Text() is 'const'
+   type is WORD, parent type is NONE => new type is QUALIFIER
+SetType : orig line is 3, orig col is 20, Text() is ''
+   type is NONE, parent type is NONE => new type is WHITESPACE
+SetType : orig line is 3, orig col is 21, Text() is 'char'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 3, orig col is 21, Text() is 'char'
+   type is WORD, parent type is NONE => new type is TYPE
+SetType : orig line is 3, orig col is 25, Text() is '*'
+   type is NONE, parent type is NONE => new type is STAR
+SetType : orig line is 3, orig col is 26, Text() is ''
+   type is NONE, parent type is NONE => new type is WHITESPACE
+SetType : orig line is 3, orig col is 27, Text() is 'pN'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 3, orig col is 29, Text() is ','
+   type is NONE, parent type is NONE => new type is COMMA
+SetType : orig line is 3, orig col is 30, Text() is ''
+   type is NONE, parent type is NONE => new type is WHITESPACE
+SetType : orig line is 3, orig col is 31, Text() is 'unsigned'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 3, orig col is 31, Text() is 'unsigned'
+   type is WORD, parent type is NONE => new type is TYPE
+SetType : orig line is 3, orig col is 39, Text() is ''
+   type is NONE, parent type is NONE => new type is WHITESPACE
+SetType : orig line is 3, orig col is 40, Text() is 'long'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 3, orig col is 40, Text() is 'long'
+   type is WORD, parent type is NONE => new type is TYPE
+SetType : orig line is 3, orig col is 44, Text() is ''
+   type is NONE, parent type is NONE => new type is WHITESPACE
+SetType : orig line is 3, orig col is 45, Text() is 'nI'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 3, orig col is 47, Text() is ')'
+   type is NONE, parent type is NONE => new type is PAREN_CLOSE
+SetType : orig line is 3, orig col is 48, Text() is ''
+   type is NONE, parent type is NONE => new type is WHITESPACE
+SetType : orig line is 3, orig col is 49, Text() is ':'
+   type is NONE, parent type is NONE => new type is COLON
+SetType : orig line is 3, orig col is 50, Text() is <Newline>
+   type is NONE, parent type is NONE => new type is NEWLINE
+SetType : orig line is 4, orig col is 1, Text() is 'pTelName'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 4, orig col is 9, Text() is '('
+   type is NONE, parent type is NONE => new type is PAREN_OPEN
+SetType : orig line is 4, orig col is 10, Text() is 'pN'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 4, orig col is 12, Text() is ')'
+   type is NONE, parent type is NONE => new type is PAREN_CLOSE
+SetType : orig line is 4, orig col is 13, Text() is ','
+   type is NONE, parent type is NONE => new type is COMMA
+SetType : orig line is 4, orig col is 14, Text() is <Newline>
+   type is NONE, parent type is NONE => new type is NEWLINE
+SetType : orig line is 5, orig col is 1, Text() is 'nTelIndex'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 5, orig col is 10, Text() is '('
+   type is NONE, parent type is NONE => new type is PAREN_OPEN
+SetType : orig line is 5, orig col is 11, Text() is 'n'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 5, orig col is 12, Text() is ')'
+   type is NONE, parent type is NONE => new type is PAREN_CLOSE
+SetType : orig line is 5, orig col is 13, Text() is <Newline>
+   type is NONE, parent type is NONE => new type is NEWLINE
+SetType : orig line is 6, orig col is 1, Text() is '{'
+   type is NONE, parent type is NONE => new type is BRACE_OPEN
+SetType : orig line is 6, orig col is 2, Text() is <Newline>
+   type is NONE, parent type is NONE => new type is NEWLINE
+SetType : orig line is 7, orig col is 1, Text() is '}'
+   type is NONE, parent type is NONE => new type is BRACE_CLOSE
+SetType : orig line is 7, orig col is 2, Text() is <Newline>
+   type is NONE, parent type is NONE => new type is NEWLINE
+SetType : orig line is 9, orig col is 1, Text() is '~'
+   type is NONE, parent type is NONE => new type is INV
+SetType : orig line is 9, orig col is 2, Text() is 'TelegramIndex'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 9, orig col is 15, Text() is '('
+   type is NONE, parent type is NONE => new type is PAREN_OPEN
+SetType : orig line is 9, orig col is 16, Text() is ')'
+   type is NONE, parent type is NONE => new type is PAREN_CLOSE
+SetType : orig line is 9, orig col is 17, Text() is <Newline>
+   type is NONE, parent type is NONE => new type is NEWLINE
+SetType : orig line is 10, orig col is 1, Text() is '{'
+   type is NONE, parent type is NONE => new type is BRACE_OPEN
+SetType : orig line is 10, orig col is 2, Text() is <Newline>
+   type is NONE, parent type is NONE => new type is NEWLINE
+SetType : orig line is 11, orig col is 1, Text() is '}'
+   type is NONE, parent type is NONE => new type is BRACE_CLOSE
+SetType : orig line is 11, orig col is 2, Text() is <Newline>
+   type is NONE, parent type is NONE => new type is NEWLINE
+SetType : orig line is 13, orig col is 1, Text() is 'const'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 13, orig col is 1, Text() is 'const'
+   type is WORD, parent type is NONE => new type is QUALIFIER
+SetType : orig line is 13, orig col is 6, Text() is ''
+   type is NONE, parent type is NONE => new type is WHITESPACE
+SetType : orig line is 13, orig col is 7, Text() is 'char'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 13, orig col is 7, Text() is 'char'
+   type is WORD, parent type is NONE => new type is TYPE
+SetType : orig line is 13, orig col is 11, Text() is '*'
+   type is NONE, parent type is NONE => new type is STAR
+SetType : orig line is 13, orig col is 12, Text() is ''
+   type is NONE, parent type is NONE => new type is WHITESPACE
+SetType : orig line is 13, orig col is 13, Text() is 'const'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 13, orig col is 13, Text() is 'const'
+   type is WORD, parent type is NONE => new type is QUALIFIER
+SetType : orig line is 13, orig col is 18, Text() is ''
+   type is NONE, parent type is NONE => new type is WHITESPACE
+SetType : orig line is 13, orig col is 19, Text() is 'pTelName'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 13, orig col is 27, Text() is ';'
+   type is NONE, parent type is NONE => new type is SEMICOLON
+SetType : orig line is 13, orig col is 28, Text() is <Newline>
+   type is NONE, parent type is NONE => new type is NEWLINE
+SetType : orig line is 14, orig col is 1, Text() is 'unsigned'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 14, orig col is 1, Text() is 'unsigned'
+   type is WORD, parent type is NONE => new type is TYPE
+SetType : orig line is 14, orig col is 9, Text() is ''
+   type is NONE, parent type is NONE => new type is WHITESPACE
+SetType : orig line is 14, orig col is 10, Text() is 'long'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 14, orig col is 10, Text() is 'long'
+   type is WORD, parent type is NONE => new type is TYPE
+SetType : orig line is 14, orig col is 14, Text() is ''
+   type is NONE, parent type is NONE => new type is WHITESPACE
+SetType : orig line is 14, orig col is 15, Text() is 'nTelIndex'
+   type is NONE, parent type is NONE => new type is WORD
+SetType : orig line is 14, orig col is 24, Text() is ';'
+   type is NONE, parent type is NONE => new type is SEMICOLON
+SetType : orig line is 14, orig col is 25, Text() is <Newline>
+   type is NONE, parent type is NONE => new type is NEWLINE
+SetType : orig line is 15, orig col is 1, Text() is '}'
+   type is NONE, parent type is NONE => new type is BRACE_CLOSE
+SetType : orig line is 15, orig col is 2, Text() is ';'
+   type is NONE, parent type is NONE => new type is SEMICOLON
+SetType : orig line is 15, orig col is 3, Text() is <Newline>
+   type is NONE, parent type is NONE => new type is NEWLINE
+SetType : orig line is 1, orig col is 8, Text() is 'TelegramIndex'
+   type is WORD, parent type is NONE => new type is TYPE
+SetType : orig line is 3, orig col is 25, Text() is '*'
+   type is STAR, parent type is NONE => new type is PTR_TYPE
+SetType : orig line is 13, orig col is 11, Text() is '*'
+   type is STAR, parent type is NONE => new type is PTR_TYPE
+SetType : orig line is 1, orig col is 8, Text() is 'TelegramIndex'
+   type is TYPE, parent type is NONE => new type is WORD
+SetType : orig line is 1, orig col is 8, Text() is 'TelegramIndex'
+   type is WORD, parent type is NONE => new type is TYPE
+SetType : orig line is 3, orig col is 1, Text() is 'TelegramIndex'
+   type is WORD, parent type is NONE => new type is FUNC_CLASS_DEF
+SetType : orig line is 3, orig col is 14, Text() is '('
+   type is PAREN_OPEN, parent type is NONE => new type is FPAREN_OPEN
+SetType : orig line is 3, orig col is 47, Text() is ')'
+   type is PAREN_CLOSE, parent type is NONE => new type is FPAREN_CLOSE
+SetType : orig line is 3, orig col is 49, Text() is ':'
+   type is COLON, parent type is NONE => new type is CONSTR_COLON
+SetType : orig line is 4, orig col is 1, Text() is 'pTelName'
+   type is WORD, parent type is NONE => new type is FUNC_CTOR_VAR
+SetType : orig line is 4, orig col is 9, Text() is '('
+   type is PAREN_OPEN, parent type is NONE => new type is FPAREN_OPEN
+SetType : orig line is 4, orig col is 12, Text() is ')'
+   type is PAREN_CLOSE, parent type is NONE => new type is FPAREN_CLOSE
+SetType : orig line is 5, orig col is 1, Text() is 'nTelIndex'
+   type is WORD, parent type is NONE => new type is FUNC_CTOR_VAR
+SetType : orig line is 5, orig col is 10, Text() is '('
+   type is PAREN_OPEN, parent type is NONE => new type is FPAREN_OPEN
+SetType : orig line is 5, orig col is 12, Text() is ')'
+   type is PAREN_CLOSE, parent type is NONE => new type is FPAREN_CLOSE
+SetType : orig line is 9, orig col is 2, Text() is 'TelegramIndex'
+   type is WORD, parent type is NONE => new type is FUNC_CLASS_DEF
+SetType : orig line is 9, orig col is 1, Text() is '~'
+   type is INV, parent type is NONE => new type is DESTRUCTOR
+SetType : orig line is 9, orig col is 15, Text() is '('
+   type is PAREN_OPEN, parent type is NONE => new type is FPAREN_OPEN
+SetType : orig line is 9, orig col is 16, Text() is ')'
+   type is PAREN_CLOSE, parent type is NONE => new type is FPAREN_CLOSE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/Debug_tracking_space.html b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/Debug_tracking_space.html
index 0b5786b1..b189de78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/Debug_tracking_space.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/Debug_tracking_space.html
@@ -10,8 +10,8 @@
 {<a title="REMOVE: 1"><font color="red">M</font></a>
    a<a title="sp_assign: 2"><font color="red">M</font></a>=<a title="sp_assign: 3, 86"><font color="red">M</font></a>b<a title="sp_arith: 4, 87, 93"><font color="red">M</font></a>+<a title="sp_arith: 5, 88, 94, 99"><font color="red">M</font></a>111<a title="sp_arith: 6, 89, 95, 100, 104"><font color="red">M</font></a>-<a title="sp_arith: 7, 90, 96, 101, 105, 108"><font color="red">M</font></a>55<a title="sp_before_semi: 8, 91, 97, 102, 106, 109, 111"><font color="red">M</font></a>;<a title="REMOVE: 9, 92, 98, 103, 107, 110, 112, 113"><font color="red">M</font></a>
 }<a title="REMOVE: 10"><font color="red">M</font></a>
-template<a title="sp_before_angle: 11"><font color="red">M</font></a>&lt;<a title="sp_inside_angle: 12, 114"><font color="red">M</font></a>typename<a title="ADD from add_space_table: 13, 115, 123"><font color="red">M</font></a>...<a title="sp_ellipsis_parameter_pack: 14, 116, 124, 131"><font color="red">M</font></a>A<a title="sp_before_comma: 15, 117, 125, 132, 138"><font color="red">M</font></a>,<a title="sp_after_comma: 16, 118, 126, 133, 139, 144"><font color="red">M</font></a>int<a title="sp_type_ellipsis: 17, 119, 127, 134, 140, 145, 149"><font color="red">M</font></a>...<a title="FORCE: 18, 120, 128, 135, 141, 146, 150, 153"><font color="red">M</font></a>B<a title="sp_inside_angle: 19, 121, 129, 136, 142, 147, 151, 154, 156"><font color="red">M</font></a>&gt;<a title="REMOVE: 20, 122, 130, 137, 143, 148, 152, 155, 157, 158"><font color="red">M</font></a>
-struct<a title="ADD from add_space_table: 21"><font color="red">M</font></a>foo1<a title="sp_after_type: 22, 159"><font color="red">M</font></a>:<a title="ADD from add_space_table: 23, 160, 177"><font color="red">M</font></a>foo1<a title="sp_before_angle: 24, 161, 178, 194"><font color="red">M</font></a>&lt;<a title="sp_inside_angle: 25, 162, 179, 195, 210"><font color="red">M</font></a>A<a title="sp_parameter_pack_ellipsis: 26, 163, 180, 196, 211, 225"><font color="red">M</font></a>...<a title="sp_before_comma: 27, 164, 181, 197, 212, 226, 239"><font color="red">M</font></a>,<a title="sp_after_comma: 28, 165, 182, 198, 213, 227, 240, 252"><font color="red">M</font></a>(<a title="sp_inside_paren: 29, 166, 183, 199, 214, 228, 241, 253, 264"><font color="red">M</font></a>sizeof<a title="sp_sizeof_ellipsis: 30, 167, 184, 200, 215, 229, 242, 254, 265, 275"><font color="red">M</font></a>...<a title="sp_sizeof_ellipsis_paren: 31, 168, 185, 201, 216, 230, 243, 255, 266, 276, 285"><font color="red">M</font></a>(<a title="sp_inside_paren: 32, 169, 186, 202, 217, 231, 244, 256, 267, 277, 286, 294"><font color="red">M</font></a>A<a title="sp_inside_paren: 33, 170, 187, 203, 218, 232, 245, 257, 268, 278, 287, 295, 302"><font color="red">M</font></a>)<a title="sp_arith: 34, 171, 188, 204, 219, 233, 246, 258, 269, 279, 288, 296, 303, 309"><font color="red">M</font></a>+<a title="sp_arith: 35, 172, 189, 205, 220, 234, 247, 259, 270, 280, 289, 297, 304, 310, 315"><font color="red">M</font></a>B<a title="sp_inside_paren: 36, 173, 190, 206, 221, 235, 248, 260, 271, 281, 290, 298, 305, 311, 316, 320"><font color="red">M</font></a>)<a title="sp_paren_ellipsis: 272, 324, 321, 317, 312, 306, 299, 291, 282, 37, 261, 249, 236, 222, 207, 191, 174"><font color="red">M</font></a>...<a title="sp_inside_angle: 283, 327, 325, 322, 318, 313, 307, 300, 292, 38, 273, 262, 250, 237, 223, 208, 192, 175"><font color="red">M</font></a>&gt;<a title="REMOVE: 284, 329, 328, 326, 323, 319, 314, 308, 301, 293, 39, 274, 263, 251, 238, 224, 209, 193, 176"><font color="red">M</font></a>
+template<a title="sp_before_angle: 11"><font color="red">M</font></a>&lt;<a title="sp_inside_angle: 12, 114"><font color="red">M</font></a>typename<a title="ADD from add_space_table @ 253.: 13, 115, 123"><font color="red">M</font></a>...<a title="sp_ellipsis_parameter_pack: 14, 116, 124, 131"><font color="red">M</font></a>A<a title="sp_before_comma: 15, 117, 125, 132, 138"><font color="red">M</font></a>,<a title="sp_after_comma: 16, 118, 126, 133, 139, 144"><font color="red">M</font></a>int<a title="sp_type_ellipsis: 17, 119, 127, 134, 140, 145, 149"><font color="red">M</font></a>...<a title="FORCE: 18, 120, 128, 135, 141, 146, 150, 153"><font color="red">M</font></a>B<a title="sp_inside_angle: 19, 121, 129, 136, 142, 147, 151, 154, 156"><font color="red">M</font></a>&gt;<a title="REMOVE: 20, 122, 130, 137, 143, 148, 152, 155, 157, 158"><font color="red">M</font></a>
+struct<a title="ADD from add_space_table @ 236.: 21"><font color="red">M</font></a>foo1<a title="sp_after_type: 22, 159"><font color="red">M</font></a>:<a title="ADD from add_space_table @ 49.: 23, 160, 177"><font color="red">M</font></a>foo1<a title="sp_before_angle: 24, 161, 178, 194"><font color="red">M</font></a>&lt;<a title="sp_inside_angle: 25, 162, 179, 195, 210"><font color="red">M</font></a>A<a title="sp_parameter_pack_ellipsis: 26, 163, 180, 196, 211, 225"><font color="red">M</font></a>...<a title="sp_before_comma: 27, 164, 181, 197, 212, 226, 239"><font color="red">M</font></a>,<a title="sp_after_comma: 28, 165, 182, 198, 213, 227, 240, 252"><font color="red">M</font></a>(<a title="sp_inside_paren: 29, 166, 183, 199, 214, 228, 241, 253, 264"><font color="red">M</font></a>sizeof<a title="sp_sizeof_ellipsis: 30, 167, 184, 200, 215, 229, 242, 254, 265, 275"><font color="red">M</font></a>...<a title="sp_sizeof_ellipsis_paren: 31, 168, 185, 201, 216, 230, 243, 255, 266, 276, 285"><font color="red">M</font></a>(<a title="sp_inside_paren: 32, 169, 186, 202, 217, 231, 244, 256, 267, 277, 286, 294"><font color="red">M</font></a>A<a title="sp_inside_paren: 33, 170, 187, 203, 218, 232, 245, 257, 268, 278, 287, 295, 302"><font color="red">M</font></a>)<a title="sp_arith: 34, 171, 188, 204, 219, 233, 246, 258, 269, 279, 288, 296, 303, 309"><font color="red">M</font></a>+<a title="sp_arith: 35, 172, 189, 205, 220, 234, 247, 259, 270, 280, 289, 297, 304, 310, 315"><font color="red">M</font></a>B<a title="sp_inside_paren: 36, 173, 190, 206, 221, 235, 248, 260, 271, 281, 290, 298, 305, 311, 316, 320"><font color="red">M</font></a>)<a title="sp_paren_ellipsis: 272, 324, 321, 317, 312, 306, 299, 291, 282, 37, 261, 249, 236, 222, 207, 191, 174"><font color="red">M</font></a>...<a title="sp_inside_angle: 283, 327, 325, 322, 318, 313, 307, 300, 292, 38, 273, 262, 250, 237, 223, 208, 192, 175"><font color="red">M</font></a>&gt;<a title="REMOVE: 284, 329, 328, 326, 323, 319, 314, 308, 301, 293, 39, 274, 263, 251, 238, 224, 209, 193, 176"><font color="red">M</font></a>
 {<a title="REMOVE: 40"><font color="red">M</font></a>
    foo1<a title="sp_func_class_paren: 41, 64"><font color="red">M</font></a>(<a title="sp_inside_fparens: 42, 65, 330"><font color="red">M</font></a>)<a title="sp_fparen_brace: 43, 66, 331, 333"><font color="red">M</font></a>{<a title="REMOVE: 44, 67, 332, 334, 335"><font color="red">M</font></a>
       int<a title="sp_after_type: 45, 68"><font color="red">M</font></a>x<a title="sp_assign: 46, 69, 336"><font color="red">M</font></a>=<a title="sp_assign: 47, 70, 337, 344"><font color="red">M</font></a>sizeof<a title="sp_sizeof_ellipsis: 48, 71, 338, 345, 351"><font color="red">M</font></a>...<a title="sp_sizeof_ellipsis_paren: 49, 72, 339, 346, 352, 357"><font color="red">M</font></a>(<a title="sp_inside_paren: 50, 73, 340, 347, 353, 358, 362"><font color="red">M</font></a>A<a title="sp_inside_paren: 51, 74, 341, 348, 354, 359, 363, 366"><font color="red">M</font></a>)<a title="sp_before_semi: 52, 75, 342, 349, 355, 360, 364, 367, 369"><font color="red">M</font></a>;<a title="REMOVE: 53, 76, 343, 350, 356, 361, 365, 368, 370, 371"><font color="red">M</font></a>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/I-842.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/I-842.txt
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/I-842.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/I-842.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/backup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/backup.h
index 210c6f7c..210c6f7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/backup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/backup.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/class_enum_struct_union.csv b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/class_enum_struct_union.csv
index c441a593..5b8e9e86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/class_enum_struct_union.csv
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/class_enum_struct_union.csv
@@ -408,46 +408,46 @@ Line,Tag,Parent_type,Type of the parent,Column,Orig Col Strt,Orig Col End,Orig S
 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,IN_CONDITIONAL",0,0,"                                                                                ?"
+89,QUESTION,NONE,COMMA,80,80,81,1,0,0,0,"PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                ?"
 89,WORD,NONE,PARENT_NOT_SET,82,82,85,1,0,0,0,"EXPR_START,IN_CONDITIONAL",0,0,"                                                                                  c32"
-89,COND_COLON,NONE,PARENT_NOT_SET,86,86,87,1,0,0,0,"PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                      :"
+89,COND_COLON,NONE,QUESTION,86,86,87,1,0,0,0,"PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                      :"
 89,WORD,NONE,PARENT_NOT_SET,88,88,95,1,0,0,0,"STMT_START,EXPR_START,IN_CONDITIONAL",0,0,"                                                                                        nullptr"
 89,COMMA,NONE,PARENT_NOT_SET,95,95,96,0,0,0,0,"PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                               ,"
-89,PTR_TYPE,CLASS,PARENT_NOT_SET,97,97,98,1,0,0,0,"EXPR_START,PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                                 *"
-89,WORD,NONE,PARENT_NOT_SET,98,98,101,0,0,0,0,"EXPR_START,VAR_DEF,IN_CONDITIONAL",0,0,"                                                                                                  c43"
-89,TSQUARE,NONE,PARENT_NOT_SET,101,101,103,0,0,0,0,"PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                                     []"
-89,ASSIGN,NONE,PARENT_NOT_SET,104,104,105,1,0,0,0,"PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                                        ="
-89,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,106,106,107,1,0,0,0,"EXPR_START,ONE_LINER,PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                                          {"
-89,WORD,NONE,PARENT_NOT_SET,108,108,115,1,1,1,0,"EXPR_START,ONE_LINER,IN_CONDITIONAL",0,0,"                                                                                                            nullptr"
-89,COMMA,NONE,PARENT_NOT_SET,115,115,116,0,1,1,0,"ONE_LINER,PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                                                   ,"
-89,WORD,NONE,PARENT_NOT_SET,117,117,124,1,1,1,0,"EXPR_START,ONE_LINER,IN_CONDITIONAL",0,0,"                                                                                                                     nullptr"
-89,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,125,125,126,1,0,0,0,"ONE_LINER,PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                                                             }"
-89,COMMA,NONE,PARENT_NOT_SET,126,126,127,0,0,0,0,"PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                                                              ,"
-89,WORD,NONE,PARENT_NOT_SET,128,128,131,1,0,0,0,"EXPR_START,VAR_DEF,LVALUE,IN_CONDITIONAL",0,0,"                                                                                                                                c44"
-89,BRACE_OPEN,BRACED_INIT_LIST,PARENT_NOT_SET,131,131,132,0,0,0,0,"ONE_LINER,PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                                                                   {"
-89,NUMBER,NONE,PARENT_NOT_SET,133,133,134,1,1,1,0,"STMT_START,EXPR_START,ONE_LINER,IN_CONDITIONAL",0,0,"                                                                                                                                     0"
-89,COMMA,NONE,PARENT_NOT_SET,134,134,135,0,1,1,0,"ONE_LINER,PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                                                                      ,"
-89,NUMBER,NONE,PARENT_NOT_SET,136,136,137,1,1,1,0,"EXPR_START,ONE_LINER,IN_CONDITIONAL",0,0,"                                                                                                                                        1"
-89,COMMA,NONE,PARENT_NOT_SET,137,137,138,0,1,1,0,"ONE_LINER,PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                                                                         ,"
-89,NUMBER,NONE,PARENT_NOT_SET,139,139,140,1,1,1,0,"EXPR_START,ONE_LINER,IN_CONDITIONAL",0,0,"                                                                                                                                           2"
-89,BRACE_CLOSE,BRACED_INIT_LIST,PARENT_NOT_SET,140,140,141,0,0,0,0,"ONE_LINER,PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                                                                            }"
-89,COMMA,NONE,PARENT_NOT_SET,141,141,142,0,0,0,0,"PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                                                                             ,"
-89,PTR_TYPE,CLASS,PARENT_NOT_SET,143,143,144,1,0,0,0,"EXPR_START,PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                                                                               *"
-89,QUALIFIER,NONE,PARENT_NOT_SET,145,145,150,1,0,0,0,"FORCE_SPACE,EXPR_START,IN_CONDITIONAL",0,0,"                                                                                                                                                 const"
-89,FUNC_CALL,NONE,PARENT_NOT_SET,151,151,154,1,0,0,0,"VAR_DEF,IN_CONDITIONAL",0,0,"                                                                                                                                                       c45"
-89,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,154,154,155,0,0,0,0,"PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                                                                                          ("
-89,WORD,NONE,PARENT_NOT_SET,155,155,162,0,0,1,0,"IN_FCN_CALL,EXPR_START,IN_CONDITIONAL",0,0,"                                                                                                                                                           nullptr"
-89,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,162,162,163,0,0,0,0,"IN_FCN_CALL,PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                                                                                                  )"
-89,COMMA,NONE,PARENT_NOT_SET,163,163,164,0,0,0,0,"PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                                                                                                   ,"
-89,FUNC_CALL,NONE,PARENT_NOT_SET,165,165,168,1,0,0,0,"EXPR_START,VAR_DEF,IN_CONDITIONAL",0,0,"                                                                                                                                                                     c46"
-89,FPAREN_OPEN,FUNC_CALL,PARENT_NOT_SET,168,168,169,0,0,0,0,"PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                                                                                                        ("
-89,NUMBER,NONE,PARENT_NOT_SET,169,169,170,0,0,1,0,"IN_FCN_CALL,EXPR_START,IN_CONDITIONAL",0,0,"                                                                                                                                                                         0"
-89,COMMA,NONE,PARENT_NOT_SET,170,170,171,0,0,1,0,"IN_FCN_CALL,PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                                                                                                          ,"
-89,NUMBER,NONE,PARENT_NOT_SET,172,172,173,1,0,1,0,"IN_FCN_CALL,EXPR_START,IN_CONDITIONAL",0,0,"                                                                                                                                                                            1"
-89,COMMA,NONE,PARENT_NOT_SET,173,173,174,0,0,1,0,"IN_FCN_CALL,PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                                                                                                             ,"
-89,NUMBER,NONE,PARENT_NOT_SET,175,175,176,1,0,1,0,"IN_FCN_CALL,EXPR_START,IN_CONDITIONAL",0,0,"                                                                                                                                                                               2"
-89,FPAREN_CLOSE,FUNC_CALL,PARENT_NOT_SET,176,176,177,0,0,0,0,"IN_FCN_CALL,PUNCTUATOR,IN_CONDITIONAL",0,0,"                                                                                                                                                                                )"
-89,SEMICOLON,CLASS,PARENT_NOT_SET,177,177,178,0,0,0,0,"PUNCTUATOR,IN_CONDITIONAL",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,
@@ -512,9 +512,9 @@ Line,Tag,Parent_type,Type of the parent,Column,Orig Col Strt,Orig Col End,Orig S
 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,ENUM_COLON,ENUM,PARENT_NOT_SET,9,9,10,1,0,0,0,"PUNCTUATOR",0,0,"         :"
+103,TYPE,ENUM_COLON,PARENT_NOT_SET,11,11,15,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0,"           long"
+103,TYPE,ENUM_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,"                         ,"
@@ -533,9 +533,9 @@ Line,Tag,Parent_type,Type of the parent,Column,Orig Col Strt,Orig Col End,Orig S
 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,ENUM_COLON,ENUM,PARENT_NOT_SET,9,9,10,1,0,0,0,"PUNCTUATOR",0,0,"         :"
+106,TYPE,ENUM_COLON,PARENT_NOT_SET,11,11,19,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0,"           unsigned"
+106,TYPE,ENUM_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,"                            ,"
@@ -549,8 +549,8 @@ Line,Tag,Parent_type,Type of the parent,Column,Orig Col Strt,Orig Col End,Orig S
 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,ENUM_COLON,ENUM,PARENT_NOT_SET,9,9,10,1,0,0,0,"PUNCTUATOR",0,0,"         :"
+109,TYPE,ENUM_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, ..."
@@ -567,9 +567,9 @@ Line,Tag,Parent_type,Type of the parent,Column,Orig Col Strt,Orig Col End,Orig S
 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,ENUM_COLON,ENUM,PARENT_NOT_SET,15,15,16,1,0,0,0,"PUNCTUATOR",0,0,"               :"
+115,TYPE,ENUM_COLON,PARENT_NOT_SET,17,17,21,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0,"                 long"
+115,TYPE,ENUM_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,"                               ,"
@@ -591,9 +591,9 @@ Line,Tag,Parent_type,Type of the parent,Column,Orig Col Strt,Orig Col End,Orig S
 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,ENUM_COLON,ENUM,PARENT_NOT_SET,15,15,16,1,0,0,0,"PUNCTUATOR",0,0,"               :"
+118,TYPE,ENUM_COLON,PARENT_NOT_SET,17,17,25,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0,"                 unsigned"
+118,TYPE,ENUM_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,"                                  ,"
@@ -608,8 +608,8 @@ Line,Tag,Parent_type,Type of the parent,Column,Orig Col Strt,Orig Col End,Orig S
 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,ENUM_COLON,ENUM,PARENT_NOT_SET,15,15,16,1,0,0,0,"PUNCTUATOR",0,0,"               :"
+121,TYPE,ENUM_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"
@@ -622,9 +622,9 @@ Line,Tag,Parent_type,Type of the parent,Column,Orig Col Strt,Orig Col End,Orig S
 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,ENUM_COLON,ENUM,PARENT_NOT_SET,6,6,7,1,0,0,0,"PUNCTUATOR",0,0,"      :"
+127,TYPE,ENUM_COLON,PARENT_NOT_SET,8,8,12,1,0,0,0,"FORCE_SPACE,STMT_START,EXPR_START",0,0,"        long"
+127,TYPE,ENUM_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,"                      ,"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/class_enum_struct_union.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/class_enum_struct_union.txt
index c52e7000..6c89600d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/class_enum_struct_union.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/class_enum_struct_union.txt
@@ -414,46 +414,46 @@
 #  89>               WORD|               NONE|     PARENT_NOT_SET[ 70/ 70/ 73/  0][0/0/0][          2108 0000][0-0]                                                                      c42
 #  89>             ASSIGN|               NONE|     PARENT_NOT_SET[ 74/ 74/ 75/  1][0/0/0][        2 0000 0000][0-0]                                                                          =
 #  89>               WORD|               NONE|     PARENT_NOT_SET[ 76/ 76/ 79/  1][0/0/0][             8 0000][0-0]                                                                            c32
-#  89>           QUESTION|               NONE|     PARENT_NOT_SET[ 80/ 80/ 81/  1][0/0/0][   1 0002 0000 0000][0-0]                                                                                ?
+#  89>           QUESTION|               NONE|              COMMA[ 80/ 80/ 81/  1][0/0/0][   1 0002 0000 0000][0-0]                                                                                ?
 #  89>               WORD|               NONE|     PARENT_NOT_SET[ 82/ 82/ 85/  1][0/0/0][   1 0000 0008 0000][0-0]                                                                                  c32
-#  89>         COND_COLON|               NONE|     PARENT_NOT_SET[ 86/ 86/ 87/  1][0/0/0][   1 0002 0000 0000][0-0]                                                                                      :
+#  89>         COND_COLON|               NONE|           QUESTION[ 86/ 86/ 87/  1][0/0/0][   1 0002 0000 0000][0-0]                                                                                      :
 #  89>               WORD|               NONE|     PARENT_NOT_SET[ 88/ 88/ 95/  1][0/0/0][   1 0000 000c 0000][0-0]                                                                                        nullptr
 #  89>              COMMA|               NONE|     PARENT_NOT_SET[ 95/ 95/ 96/  0][0/0/0][   1 0002 0000 0000][0-0]                                                                                               ,
-#  89>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 97/ 97/ 98/  1][0/0/0][   1 0002 0008 0000][0-0]                                                                                                 *
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 98/ 98/101/  0][0/0/0][   1 0000 0108 0000][0-0]                                                                                                  c43
-#  89>            TSQUARE|               NONE|     PARENT_NOT_SET[101/101/103/  0][0/0/0][   1 0002 0000 0000][0-0]                                                                                                     []
-#  89>             ASSIGN|               NONE|     PARENT_NOT_SET[104/104/105/  1][0/0/0][   1 0002 0000 0000][0-0]                                                                                                        =
-#  89>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[106/106/107/  1][0/0/0][   1 0002 4008 0000][0-0]                                                                                                          {
-#  89>               WORD|               NONE|     PARENT_NOT_SET[108/108/115/  1][1/1/0][   1 0000 4008 0000][0-0]                                                                                                            nullptr
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[115/115/116/  0][1/1/0][   1 0002 4000 0000][0-0]                                                                                                                   ,
-#  89>               WORD|               NONE|     PARENT_NOT_SET[117/117/124/  1][1/1/0][   1 0000 4008 0000][0-0]                                                                                                                     nullptr
-#  89>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[125/125/126/  1][0/0/0][   1 0002 4000 0000][0-0]                                                                                                                             }
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[126/126/127/  0][0/0/0][   1 0002 0000 0000][0-0]                                                                                                                              ,
-#  89>               WORD|               NONE|     PARENT_NOT_SET[128/128/131/  1][0/0/0][   1 0000 2108 0000][0-0]                                                                                                                                c44
-#  89>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[131/131/132/  0][0/0/0][   1 0002 4000 0000][0-0]                                                                                                                                   {
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[133/133/134/  1][1/1/0][   1 0000 400c 0000][0-0]                                                                                                                                     0
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[134/134/135/  0][1/1/0][   1 0002 4000 0000][0-0]                                                                                                                                      ,
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[136/136/137/  1][1/1/0][   1 0000 4008 0000][0-0]                                                                                                                                        1
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[137/137/138/  0][1/1/0][   1 0002 4000 0000][0-0]                                                                                                                                         ,
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[139/139/140/  1][1/1/0][   1 0000 4008 0000][0-0]                                                                                                                                           2
-#  89>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[140/140/141/  0][0/0/0][   1 0002 4000 0000][0-0]                                                                                                                                            }
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[141/141/142/  0][0/0/0][   1 0002 0000 0000][0-0]                                                                                                                                             ,
-#  89>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[143/143/144/  1][0/0/0][   1 0002 0008 0000][0-0]                                                                                                                                               *
-#  89>          QUALIFIER|               NONE|     PARENT_NOT_SET[145/145/150/  1][0/0/0][   1 0000 000a 0000][0-0]                                                                                                                                                 const
-#  89>          FUNC_CALL|               NONE|     PARENT_NOT_SET[151/151/154/  1][0/0/0][   1 0000 0100 0000][0-0]                                                                                                                                                       c45
-#  89>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[154/154/155/  0][0/0/0][   1 0002 0000 0000][0-0]                                                                                                                                                          (
-#  89>               WORD|               NONE|     PARENT_NOT_SET[155/155/162/  0][0/1/0][   1 0000 0008 0010][0-0]                                                                                                                                                           nullptr
-#  89>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[162/162/163/  0][0/0/0][   1 0002 0000 0010][0-0]                                                                                                                                                                  )
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[163/163/164/  0][0/0/0][   1 0002 0000 0000][0-0]                                                                                                                                                                   ,
-#  89>          FUNC_CALL|               NONE|     PARENT_NOT_SET[165/165/168/  1][0/0/0][   1 0000 0108 0000][0-0]                                                                                                                                                                     c46
-#  89>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[168/168/169/  0][0/0/0][   1 0002 0000 0000][0-0]                                                                                                                                                                        (
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[169/169/170/  0][0/1/0][   1 0000 0008 0010][0-0]                                                                                                                                                                         0
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[170/170/171/  0][0/1/0][   1 0002 0000 0010][0-0]                                                                                                                                                                          ,
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[172/172/173/  1][0/1/0][   1 0000 0008 0010][0-0]                                                                                                                                                                            1
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[173/173/174/  0][0/1/0][   1 0002 0000 0010][0-0]                                                                                                                                                                             ,
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[175/175/176/  1][0/1/0][   1 0000 0008 0010][0-0]                                                                                                                                                                               2
-#  89>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[176/176/177/  0][0/0/0][   1 0002 0000 0010][0-0]                                                                                                                                                                                )
-#  89>          SEMICOLON|              CLASS|     PARENT_NOT_SET[177/177/178/  0][0/0/0][   1 0002 0000 0000][0-0]                                                                                                                                                                                 ;
+#  89>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 97/ 97/ 98/  1][0/0/0][        2 0008 0000][0-0]                                                                                                 *
+#  89>               WORD|               NONE|     PARENT_NOT_SET[ 98/ 98/101/  0][0/0/0][           108 0000][0-0]                                                                                                  c43
+#  89>            TSQUARE|               NONE|     PARENT_NOT_SET[101/101/103/  0][0/0/0][        2 0000 0000][0-0]                                                                                                     []
+#  89>             ASSIGN|               NONE|     PARENT_NOT_SET[104/104/105/  1][0/0/0][        2 0000 0000][0-0]                                                                                                        =
+#  89>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[106/106/107/  1][0/0/0][        2 4008 0000][0-0]                                                                                                          {
+#  89>               WORD|               NONE|     PARENT_NOT_SET[108/108/115/  1][1/1/0][          4008 0000][0-0]                                                                                                            nullptr
+#  89>              COMMA|               NONE|     PARENT_NOT_SET[115/115/116/  0][1/1/0][        2 4000 0000][0-0]                                                                                                                   ,
+#  89>               WORD|               NONE|     PARENT_NOT_SET[117/117/124/  1][1/1/0][          4008 0000][0-0]                                                                                                                     nullptr
+#  89>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[125/125/126/  1][0/0/0][        2 4000 0000][0-0]                                                                                                                             }
+#  89>              COMMA|               NONE|     PARENT_NOT_SET[126/126/127/  0][0/0/0][        2 0000 0000][0-0]                                                                                                                              ,
+#  89>               WORD|               NONE|     PARENT_NOT_SET[128/128/131/  1][0/0/0][          2108 0000][0-0]                                                                                                                                c44
+#  89>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[131/131/132/  0][0/0/0][        2 4000 0000][0-0]                                                                                                                                   {
+#  89>             NUMBER|               NONE|     PARENT_NOT_SET[133/133/134/  1][1/1/0][          400c 0000][0-0]                                                                                                                                     0
+#  89>              COMMA|               NONE|     PARENT_NOT_SET[134/134/135/  0][1/1/0][        2 4000 0000][0-0]                                                                                                                                      ,
+#  89>             NUMBER|               NONE|     PARENT_NOT_SET[136/136/137/  1][1/1/0][          4008 0000][0-0]                                                                                                                                        1
+#  89>              COMMA|               NONE|     PARENT_NOT_SET[137/137/138/  0][1/1/0][        2 4000 0000][0-0]                                                                                                                                         ,
+#  89>             NUMBER|               NONE|     PARENT_NOT_SET[139/139/140/  1][1/1/0][          4008 0000][0-0]                                                                                                                                           2
+#  89>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[140/140/141/  0][0/0/0][        2 4000 0000][0-0]                                                                                                                                            }
+#  89>              COMMA|               NONE|     PARENT_NOT_SET[141/141/142/  0][0/0/0][        2 0000 0000][0-0]                                                                                                                                             ,
+#  89>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[143/143/144/  1][0/0/0][        2 0008 0000][0-0]                                                                                                                                               *
+#  89>          QUALIFIER|               NONE|     PARENT_NOT_SET[145/145/150/  1][0/0/0][             a 0000][0-0]                                                                                                                                                 const
+#  89>          FUNC_CALL|               NONE|     PARENT_NOT_SET[151/151/154/  1][0/0/0][           100 0000][0-0]                                                                                                                                                       c45
+#  89>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[154/154/155/  0][0/0/0][        2 0000 0000][0-0]                                                                                                                                                          (
+#  89>               WORD|               NONE|     PARENT_NOT_SET[155/155/162/  0][0/1/0][             8 0010][0-0]                                                                                                                                                           nullptr
+#  89>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[162/162/163/  0][0/0/0][        2 0000 0010][0-0]                                                                                                                                                                  )
+#  89>              COMMA|               NONE|     PARENT_NOT_SET[163/163/164/  0][0/0/0][        2 0000 0000][0-0]                                                                                                                                                                   ,
+#  89>          FUNC_CALL|               NONE|     PARENT_NOT_SET[165/165/168/  1][0/0/0][           108 0000][0-0]                                                                                                                                                                     c46
+#  89>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[168/168/169/  0][0/0/0][        2 0000 0000][0-0]                                                                                                                                                                        (
+#  89>             NUMBER|               NONE|     PARENT_NOT_SET[169/169/170/  0][0/1/0][             8 0010][0-0]                                                                                                                                                                         0
+#  89>              COMMA|               NONE|     PARENT_NOT_SET[170/170/171/  0][0/1/0][        2 0000 0010][0-0]                                                                                                                                                                          ,
+#  89>             NUMBER|               NONE|     PARENT_NOT_SET[172/172/173/  1][0/1/0][             8 0010][0-0]                                                                                                                                                                            1
+#  89>              COMMA|               NONE|     PARENT_NOT_SET[173/173/174/  0][0/1/0][        2 0000 0010][0-0]                                                                                                                                                                             ,
+#  89>             NUMBER|               NONE|     PARENT_NOT_SET[175/175/176/  1][0/1/0][             8 0010][0-0]                                                                                                                                                                               2
+#  89>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[176/176/177/  0][0/0/0][        2 0000 0010][0-0]                                                                                                                                                                                )
+#  89>          SEMICOLON|              CLASS|     PARENT_NOT_SET[177/177/178/  0][0/0/0][        2 0000 0000][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]
@@ -518,9 +518,9 @@
 # 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][             e 0000][0-0] enum
 # 103>               TYPE|               ENUM|     PARENT_NOT_SET[  6/  6/  8/  1][0/0/0][            80 0000][0-0]      e1
-# 103>          BIT_COLON|               ENUM|     PARENT_NOT_SET[  9/  9/ 10/  1][0/0/0][        2 0000 0000][0-0]         :
-# 103>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 11/ 11/ 15/  1][0/0/0][             e 0000][0-0]           long
-# 103>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 16/ 16/ 20/  1][0/0/0][                  0][0-0]                long
+# 103>         ENUM_COLON|               ENUM|     PARENT_NOT_SET[  9/  9/ 10/  1][0/0/0][        2 0000 0000][0-0]         :
+# 103>               TYPE|         ENUM_COLON|     PARENT_NOT_SET[ 11/ 11/ 15/  1][0/0/0][             e 0000][0-0]           long
+# 103>               TYPE|         ENUM_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][        2 4000 0000][0-0]                     {
 # 103>               WORD|               NONE|     PARENT_NOT_SET[ 23/ 23/ 25/  1][1/1/0][          400c 0004][0-0]                       a1
 # 103>              COMMA|               NONE|     PARENT_NOT_SET[ 25/ 25/ 26/  0][1/1/0][        2 4000 0004][0-0]                         ,
@@ -539,9 +539,9 @@
 # 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][             e 0000][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][        2 0000 0000][0-0]         :
-# 106>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 11/ 11/ 19/  1][0/0/0][             e 0000][0-0]           unsigned
-# 106>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 20/ 20/ 23/  1][0/0/0][                  0][0-0]                    int
+# 106>         ENUM_COLON|               ENUM|     PARENT_NOT_SET[  9/  9/ 10/  1][0/0/0][        2 0000 0000][0-0]         :
+# 106>               TYPE|         ENUM_COLON|     PARENT_NOT_SET[ 11/ 11/ 19/  1][0/0/0][             e 0000][0-0]           unsigned
+# 106>               TYPE|         ENUM_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][        2 4000 0000][0-0]                        {
 # 106>               WORD|               NONE|     PARENT_NOT_SET[ 26/ 26/ 28/  1][1/1/0][          400c 0004][0-0]                          a2
 # 106>              COMMA|               NONE|     PARENT_NOT_SET[ 28/ 28/ 29/  0][1/1/0][        2 4000 0004][0-0]                            ,
@@ -555,8 +555,8 @@
 # 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][     1000 000e 0000][0-0] enum
 # 109>               TYPE|               ENUM|     PARENT_NOT_SET[  6/  6/  8/  1][0/0/0][     1000 0000 0000][0-0]      e3
-# 109>          BIT_COLON|               ENUM|     PARENT_NOT_SET[  9/  9/ 10/  1][0/0/0][        2 0000 0000][0-0]         :
-# 109>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 11/ 11/ 16/  1][0/0/0][             c 0000][0-0]           short
+# 109>         ENUM_COLON|               ENUM|     PARENT_NOT_SET[  9/  9/ 10/  1][0/0/0][        2 0000 0000][0-0]         :
+# 109>               TYPE|         ENUM_COLON|     PARENT_NOT_SET[ 11/ 11/ 16/  1][0/0/0][             c 0000][0-0]           short
 # 109>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 16/ 16/ 17/  0][0/0/0][        2 0000 0000][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, ...
@@ -573,9 +573,9 @@
 # 115>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][             e 0000][0-0] enum
 # 115>         ENUM_CLASS|               NONE|     PARENT_NOT_SET[  6/  6/ 11/  1][0/0/0][             2 0000][0-0]      class
 # 115>               TYPE|               ENUM|     PARENT_NOT_SET[ 12/ 12/ 14/  1][0/0/0][            80 0000][0-0]            e4
-# 115>          BIT_COLON|               ENUM|     PARENT_NOT_SET[ 15/ 15/ 16/  1][0/0/0][        2 0000 0000][0-0]               :
-# 115>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 17/ 17/ 21/  1][0/0/0][             e 0000][0-0]                 long
-# 115>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 22/ 22/ 26/  1][0/0/0][                  0][0-0]                      long
+# 115>         ENUM_COLON|               ENUM|     PARENT_NOT_SET[ 15/ 15/ 16/  1][0/0/0][        2 0000 0000][0-0]               :
+# 115>               TYPE|         ENUM_COLON|     PARENT_NOT_SET[ 17/ 17/ 21/  1][0/0/0][             e 0000][0-0]                 long
+# 115>               TYPE|         ENUM_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][        2 4000 0000][0-0]                           {
 # 115>               WORD|               NONE|     PARENT_NOT_SET[ 29/ 29/ 31/  1][1/1/0][          400c 0004][0-0]                             a4
 # 115>              COMMA|               NONE|     PARENT_NOT_SET[ 31/ 31/ 32/  0][1/1/0][        2 4000 0004][0-0]                               ,
@@ -597,9 +597,9 @@
 # 118>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][             e 0000][0-0] enum
 # 118>         ENUM_CLASS|               NONE|     PARENT_NOT_SET[  6/  6/ 11/  1][0/0/0][             2 0000][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][        2 0000 0000][0-0]               :
-# 118>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 17/ 17/ 25/  1][0/0/0][             e 0000][0-0]                 unsigned
-# 118>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 26/ 26/ 29/  1][0/0/0][                  0][0-0]                          int
+# 118>         ENUM_COLON|               ENUM|     PARENT_NOT_SET[ 15/ 15/ 16/  1][0/0/0][        2 0000 0000][0-0]               :
+# 118>               TYPE|         ENUM_COLON|     PARENT_NOT_SET[ 17/ 17/ 25/  1][0/0/0][             e 0000][0-0]                 unsigned
+# 118>               TYPE|         ENUM_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][        2 4000 0000][0-0]                              {
 # 118>               WORD|               NONE|     PARENT_NOT_SET[ 32/ 32/ 34/  1][1/1/0][          400c 0004][0-0]                                a5
 # 118>              COMMA|               NONE|     PARENT_NOT_SET[ 34/ 34/ 35/  0][1/1/0][        2 4000 0004][0-0]                                  ,
@@ -614,8 +614,8 @@
 # 121>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][     1000 000e 0000][0-0] enum
 # 121>         ENUM_CLASS|               NONE|     PARENT_NOT_SET[  6/  6/ 11/  1][0/0/0][     1000 0002 0000][0-0]      class
 # 121>               TYPE|               ENUM|     PARENT_NOT_SET[ 12/ 12/ 14/  1][0/0/0][     1000 0000 0000][0-0]            e6
-# 121>          BIT_COLON|               ENUM|     PARENT_NOT_SET[ 15/ 15/ 16/  1][0/0/0][        2 0000 0000][0-0]               :
-# 121>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 17/ 17/ 22/  1][0/0/0][             c 0000][0-0]                 short
+# 121>         ENUM_COLON|               ENUM|     PARENT_NOT_SET[ 15/ 15/ 16/  1][0/0/0][        2 0000 0000][0-0]               :
+# 121>               TYPE|         ENUM_COLON|     PARENT_NOT_SET[ 17/ 17/ 22/  1][0/0/0][             c 0000][0-0]                 short
 # 121>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/0][        2 0000 0000][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
@@ -628,9 +628,9 @@
 # 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][             c 0000][0-0] enum
-# 127>          BIT_COLON|               ENUM|     PARENT_NOT_SET[  6/  6/  7/  1][0/0/0][        2 0000 0000][0-0]      :
-# 127>               TYPE|          BIT_COLON|     PARENT_NOT_SET[  8/  8/ 12/  1][0/0/0][             e 0000][0-0]        long
-# 127>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 13/ 13/ 17/  1][0/0/0][                  0][0-0]             long
+# 127>         ENUM_COLON|               ENUM|     PARENT_NOT_SET[  6/  6/  7/  1][0/0/0][        2 0000 0000][0-0]      :
+# 127>               TYPE|         ENUM_COLON|     PARENT_NOT_SET[  8/  8/ 12/  1][0/0/0][             e 0000][0-0]        long
+# 127>               TYPE|         ENUM_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][        2 4000 0000][0-0]                  {
 # 127>               WORD|               NONE|     PARENT_NOT_SET[ 20/ 20/ 22/  1][1/1/0][          400c 0004][0-0]                    a8
 # 127>              COMMA|               NONE|     PARENT_NOT_SET[ 22/ 22/ 23/  0][1/1/0][        2 4000 0004][0-0]                      ,
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/copyright-header.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/copyright-header.cpp
index 348902a5..348902a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/copyright-header.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/copyright-header.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/help.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/help.txt
index f6c25116..a5d7d109 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/help.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/help.txt
@@ -61,8 +61,9 @@ Debug Options:
  -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 space tracking information for debugging.
- --tracking_nl FILE    : Prepare newline tracking information for debugging.
+ --tracking space:FILE : Prepare space tracking information for debugging.
+ --tracking nl:FILE    : Prepare newline tracking information for debugging.
+ --tracking start:FILE : Prepare start of statement tracking information for debugging.
                          Cannot be used with the -o option'
 
 Usage Examples
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/in_fcn_def.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/in_fcn_def.txt
new file mode 100644
index 00000000..95d072a7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/in_fcn_def.txt
@@ -0,0 +1,62 @@
+
+# option(s) with 'not default' value: 0
+#
+# -=====-
+# number of loops               = 0
+# -=====-
+# language                      = CPP
+# -=====-
+# Line                Tag         Parent_type  Type of the parent         Columns Br/Lvl/pp             Flags   Nl  Text
+#   1>               TYPE|           FUNC_VAR|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][             c 0000][0-0] void
+#   1>        TPAREN_OPEN|           FUNC_VAR|     PARENT_NOT_SET[  6/  6/  7/  1][0/0/0][        2 0300 0000][0-0]      (
+#   1>           PTR_TYPE|               NONE|     PARENT_NOT_SET[  7/  7/  8/  0][0/1/0][        2 0008 0000][0-0]       *
+#   1>           FUNC_VAR|               NONE|     PARENT_NOT_SET[  8/  8/ 13/  0][0/1/0][           308 0000][0-0]        fnPtr
+#   1>       TPAREN_CLOSE|           FUNC_VAR|     PARENT_NOT_SET[ 13/ 13/ 14/  0][0/0/0][        2 0000 0000][0-0]             )
+#   1>        FPAREN_OPEN|         FUNC_PROTO|     PARENT_NOT_SET[ 14/ 14/ 15/  0][0/0/0][        2 0000 0000][0-0]              (
+#   1>               TYPE|               NONE|     PARENT_NOT_SET[ 15/ 15/ 18/  0][0/1/0][            8a 0008][0-0]               int
+#   1>               WORD|               NONE|     PARENT_NOT_SET[ 19/ 19/ 20/  1][0/1/0][           100 0008][0-0]                   i
+#   1>              COMMA|               NONE|     PARENT_NOT_SET[ 20/ 20/ 21/  0][0/1/0][        2 0000 0008][0-0]                    ,
+#   1>               TYPE|               NONE|     PARENT_NOT_SET[ 22/ 22/ 28/  1][0/1/0][            8a 0008][0-0]                      double
+#   1>               WORD|               NONE|     PARENT_NOT_SET[ 29/ 29/ 30/  1][0/1/0][           100 0008][0-0]                             d
+#   1>       FPAREN_CLOSE|         FUNC_PROTO|     PARENT_NOT_SET[ 30/ 30/ 31/  0][0/0/0][        2 0000 0008][0-0]                              )
+#   1>          SEMICOLON|           FUNC_VAR|     PARENT_NOT_SET[ 31/ 31/ 32/  0][0/0/0][        2 0000 0000][0-0]                               ;
+#   1>            NEWLINE|               NONE|     PARENT_NOT_SET[ 32/ 32/  1/  0][0/0/0][                  0][1-0]
+#   2>               TYPE|         FUNC_PROTO|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][             e 0000][0-0] void
+#   2>         FUNC_PROTO|               NONE|     PARENT_NOT_SET[  6/  6/ 14/  1][0/0/0][                  0][0-0]      function
+#   2>        FPAREN_OPEN|         FUNC_PROTO|     PARENT_NOT_SET[ 14/ 14/ 15/  0][0/0/0][        2 0000 0000][0-0]              (
+#   2>               TYPE|               NONE|     PARENT_NOT_SET[ 15/ 15/ 18/  0][0/1/0][            8a 0008][0-0]               int
+#   2>               WORD|               NONE|     PARENT_NOT_SET[ 19/ 19/ 20/  1][0/1/0][           100 0008][0-0]                   i
+#   2>              COMMA|               NONE|     PARENT_NOT_SET[ 20/ 20/ 21/  0][0/1/0][        2 0000 0008][0-0]                    ,
+#   2>               TYPE|               NONE|     PARENT_NOT_SET[ 22/ 22/ 28/  1][0/1/0][            8a 0008][0-0]                      double
+#   2>               WORD|               NONE|     PARENT_NOT_SET[ 29/ 29/ 30/  1][0/1/0][           100 0008][0-0]                             d
+#   2>       FPAREN_CLOSE|         FUNC_PROTO|     PARENT_NOT_SET[ 30/ 30/ 31/  0][0/0/0][        2 0000 0008][0-0]                              )
+#   2>          SEMICOLON|         FUNC_PROTO|     PARENT_NOT_SET[ 31/ 31/ 32/  0][0/0/0][        2 0000 0000][0-0]                               ;
+#   2>            NEWLINE|               NONE|     PARENT_NOT_SET[ 32/ 32/  1/  0][0/0/0][                  0][1-0]
+#   3>            TYPEDEF|               NONE|     PARENT_NOT_SET[  1/  1/  8/  0][0/0/0][             e 0000][0-0] typedef
+#   3>               TYPE|          FUNC_TYPE|     PARENT_NOT_SET[  9/  9/ 13/  1][0/0/0][                 80][0-1]         void
+#   3>        TPAREN_OPEN|          FUNC_TYPE|     PARENT_NOT_SET[ 14/ 14/ 15/  1][0/0/0][        2 0000 0080][0-0]              (
+#   3>           PTR_TYPE|               NONE|     PARENT_NOT_SET[ 15/ 15/ 16/  0][0/1/0][        2 0008 0080][0-0]               *
+#   3>          FUNC_TYPE|            TYPEDEF|     PARENT_NOT_SET[ 16/ 16/ 21/  0][0/1/0][             8 0080][0-0]                fnPtr
+#   3>       TPAREN_CLOSE|          FUNC_TYPE|     PARENT_NOT_SET[ 21/ 21/ 22/  0][0/0/0][        2 0000 0080][0-0]                     )
+#   3>        FPAREN_OPEN|         FUNC_PROTO|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/0][        2 0000 0080][0-0]                      (
+#   3>               TYPE|               NONE|     PARENT_NOT_SET[ 23/ 23/ 26/  0][0/1/0][            8a 0088][0-0]                       int
+#   3>               WORD|               NONE|     PARENT_NOT_SET[ 27/ 27/ 28/  1][0/1/0][           100 0088][0-0]                           i
+#   3>              COMMA|               NONE|     PARENT_NOT_SET[ 28/ 28/ 29/  0][0/1/0][        2 0000 0088][0-0]                            ,
+#   3>               TYPE|               NONE|     PARENT_NOT_SET[ 30/ 30/ 36/  1][0/1/0][            8a 0088][0-0]                              double
+#   3>               WORD|               NONE|     PARENT_NOT_SET[ 37/ 37/ 38/  1][0/1/0][           100 0088][0-0]                                     d
+#   3>       FPAREN_CLOSE|         FUNC_PROTO|     PARENT_NOT_SET[ 38/ 38/ 39/  0][0/0/0][        2 0000 0088][0-0]                                      )
+#   3>          SEMICOLON|            TYPEDEF|     PARENT_NOT_SET[ 39/ 39/ 40/  0][0/0/0][        2 0000 0080][0-0]                                       ;
+#   3>            NEWLINE|               NONE|     PARENT_NOT_SET[ 40/ 40/  1/  0][0/0/0][                  0][1-0]
+#   4>            TYPEDEF|               NONE|     PARENT_NOT_SET[  1/  1/  8/  0][0/0/0][             e 0000][0-0] typedef
+#   4>               TYPE|               NONE|     PARENT_NOT_SET[  9/  9/ 13/  1][0/0/0][             2 0080][0-1]         void
+#   4>          FUNC_TYPE|            TYPEDEF|     PARENT_NOT_SET[ 14/ 14/ 22/  1][0/0/0][                 80][0-0]              function
+#   4>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/0][        2 0000 0080][0-0]                      (
+#   4>               TYPE|               NONE|     PARENT_NOT_SET[ 23/ 23/ 26/  0][0/1/0][            8a 0088][0-0]                       int
+#   4>               WORD|               NONE|     PARENT_NOT_SET[ 27/ 27/ 28/  1][0/1/0][           100 0088][0-0]                           i
+#   4>              COMMA|               NONE|     PARENT_NOT_SET[ 28/ 28/ 29/  0][0/1/0][        2 0000 0088][0-0]                            ,
+#   4>               TYPE|               NONE|     PARENT_NOT_SET[ 30/ 30/ 36/  1][0/1/0][            8a 0088][0-0]                              double
+#   4>               WORD|               NONE|     PARENT_NOT_SET[ 37/ 37/ 38/  1][0/1/0][           100 0088][0-0]                                     d
+#   4>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 38/ 38/ 39/  0][0/0/0][        2 0000 0088][0-0]                                      )
+#   4>          SEMICOLON|            TYPEDEF|     PARENT_NOT_SET[ 39/ 39/ 40/  0][0/0/0][        2 0000 0080][0-0]                                       ;
+#   4>            NEWLINE|               NONE|     PARENT_NOT_SET[ 40/ 40/  1/  0][0/0/0][                  0][2-0]
+# -=====-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/logger_cs_L_99.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/logger_cs_L_99.txt
index 44abdcfd..44abdcfd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/logger_cs_L_99.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/logger_cs_L_99.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/p.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/p.txt
index 616c7066..616c7066 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/p.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/p.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/pc-.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/pc-.txt
index aa0e221e..aa0e221e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/pc-.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/pc-.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/replace.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/replace.txt
new file mode 100644
index 00000000..e643b5cd
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/replace.txt
@@ -0,0 +1,2 @@
+do_source_file: Parsing: input/I-3310.c as language C
+do_source_file: Parsing: input/backup.h as language C-Header
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/truncate.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/truncate.txt
index 3b63da09..3b63da09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/truncate.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/truncate.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/universalindent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/universalindent.cfg
index 4d7457be..61277071 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/universalindent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/universalindent.cfg
@@ -2,7 +2,7 @@
 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|*.c++|*.cc|*.cp|*.cpp|*.cs|*.cxx|*.d|*.di|*.es|*.h|*.h++|*.hh|*.hp|*.hpp|*.hxx|*.inl|*.java|*.js|*.m|*.mm|*.p|*.pawn|*.sma|*.sqc|*.sql|*.vala
+fileTypes=*.c|*.c++|*.cc|*.cp|*.cpp|*.cs|*.cxx|*.d|*.di|*.es|*.h|*.h++|*.hh|*.hp|*.hpp|*.hxx|*.inc|*.inl|*.java|*.js|*.m|*.mm|*.p|*.pawn|*.sma|*.sqc|*.sql|*.vala|*.vapi
 indenterFileName=uncrustify
 indenterName=Uncrustify (C, C++, C#, ObjectiveC, D, Java, Pawn, VALA)
 inputFileName=indentinput
@@ -15,6 +15,7 @@ parameterOrder=ipo
 showHelpParameter=-h
 stringparaminquotes=false
 useCfgFileParameter="-c "
+useRegex=true
 
 
 [Newlines]
@@ -22,7 +23,7 @@ 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
+Choices=newlines\s*=\s*lf|newlines\s*=\s*crlf|newlines\s*=\s*cr|newlines\s*=\s*auto
 ChoicesReadable="Newlines Unix|Newlines Win|Newlines Mac|Newlines Auto"
 ValueDefault=auto
 
@@ -31,7 +32,7 @@ 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="
+CallName="input_tab_size\s*=\s*"
 MinVal=1
 MaxVal=32
 ValueDefault=8
@@ -41,7 +42,7 @@ 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="
+CallName="output_tab_size\s*=\s*"
 MinVal=1
 MaxVal=32
 ValueDefault=8
@@ -51,7 +52,7 @@ 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="
+CallName="string_escape_char\s*=\s*"
 MinVal=0
 MaxVal=255
 ValueDefault=92
@@ -61,7 +62,7 @@ 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="
+CallName="string_escape_char2\s*=\s*"
 MinVal=0
 MaxVal=255
 ValueDefault=0
@@ -71,7 +72,7 @@ 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
+TrueFalse=string_replace_tab_chars\s*=\s*true|string_replace_tab_chars\s*=\s*false
 ValueDefault=false
 
 [Tok Split Gte]
@@ -79,7 +80,7 @@ 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
+TrueFalse=tok_split_gte\s*=\s*true|tok_split_gte\s*=\s*false
 ValueDefault=false
 
 [Disable Processing Nl Cont]
@@ -87,14 +88,14 @@ 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
+TrueFalse=disable_processing_nl_cont\s*=\s*true|disable_processing_nl_cont\s*=\s*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=
+CallName=disable_processing_cmt\s*=\s*
 EditorType=string
 ValueDefault= *INDENT-OFF*
 
@@ -102,7 +103,7 @@ ValueDefault= *INDENT-OFF*
 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=
+CallName=enable_processing_cmt\s*=\s*
 EditorType=string
 ValueDefault= *INDENT-ON*
 
@@ -111,7 +112,7 @@ Category=0
 Description="<html>Enable parsing of digraphs.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=enable_digraphs=true|enable_digraphs=false
+TrueFalse=enable_digraphs\s*=\s*true|enable_digraphs\s*=\s*false
 ValueDefault=false
 
 [Processing Cmt As Regex]
@@ -119,7 +120,7 @@ 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
+TrueFalse=processing_cmt_as_regex\s*=\s*true|processing_cmt_as_regex\s*=\s*false
 ValueDefault=false
 
 [Utf8 Bom]
@@ -127,7 +128,7 @@ 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
+Choices=utf8_bom\s*=\s*ignore|utf8_bom\s*=\s*add|utf8_bom\s*=\s*remove|utf8_bom\s*=\s*force|utf8_bom\s*=\s*not_defined
 ChoicesReadable="Ignore Utf8 Bom|Add Utf8 Bom|Remove Utf8 Bom|Force Utf8 Bom"
 ValueDefault=ignore
 
@@ -136,7 +137,7 @@ 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
+TrueFalse=utf8_byte\s*=\s*true|utf8_byte\s*=\s*false
 ValueDefault=false
 
 [Utf8 Force]
@@ -144,7 +145,7 @@ Category=0
 Description="<html>Force the output encoding to UTF-8.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=utf8_force=true|utf8_force=false
+TrueFalse=utf8_force\s*=\s*true|utf8_force\s*=\s*false
 ValueDefault=false
 
 [Sp Arith]
@@ -152,7 +153,7 @@ 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
+Choices=sp_arith\s*=\s*ignore|sp_arith\s*=\s*add|sp_arith\s*=\s*remove|sp_arith\s*=\s*force|sp_arith\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Arith|Add Sp Arith|Remove Sp Arith|Force Sp Arith"
 ValueDefault=ignore
 
@@ -161,7 +162,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|sp_arith_additive=not_defined
+Choices=sp_arith_additive\s*=\s*ignore|sp_arith_additive\s*=\s*add|sp_arith_additive\s*=\s*remove|sp_arith_additive\s*=\s*force|sp_arith_additive\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Arith Additive|Add Sp Arith Additive|Remove Sp Arith Additive|Force Sp Arith Additive"
 ValueDefault=ignore
 
@@ -170,7 +171,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|sp_assign=not_defined
+Choices=sp_assign\s*=\s*ignore|sp_assign\s*=\s*add|sp_assign\s*=\s*remove|sp_assign\s*=\s*force|sp_assign\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Assign|Add Sp Assign|Remove Sp Assign|Force Sp Assign"
 ValueDefault=ignore
 
@@ -179,7 +180,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|sp_cpp_lambda_assign=not_defined
+Choices=sp_cpp_lambda_assign\s*=\s*ignore|sp_cpp_lambda_assign\s*=\s*add|sp_cpp_lambda_assign\s*=\s*remove|sp_cpp_lambda_assign\s*=\s*force|sp_cpp_lambda_assign\s*=\s*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
 
@@ -188,7 +189,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|sp_cpp_lambda_square_paren=not_defined
+Choices=sp_cpp_lambda_square_paren\s*=\s*ignore|sp_cpp_lambda_square_paren\s*=\s*add|sp_cpp_lambda_square_paren\s*=\s*remove|sp_cpp_lambda_square_paren\s*=\s*force|sp_cpp_lambda_square_paren\s*=\s*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
 
@@ -197,16 +198,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|sp_cpp_lambda_square_brace=not_defined
+Choices=sp_cpp_lambda_square_brace\s*=\s*ignore|sp_cpp_lambda_square_brace\s*=\s*add|sp_cpp_lambda_square_brace\s*=\s*remove|sp_cpp_lambda_square_brace\s*=\s*force|sp_cpp_lambda_square_brace\s*=\s*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 Empty]
+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; ){ ... }'<br/>with an empty list.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_cpp_lambda_argument_list_empty\s*=\s*ignore|sp_cpp_lambda_argument_list_empty\s*=\s*add|sp_cpp_lambda_argument_list_empty\s*=\s*remove|sp_cpp_lambda_argument_list_empty\s*=\s*force|sp_cpp_lambda_argument_list_empty\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Cpp Lambda Argument List Empty|Add Sp Cpp Lambda Argument List Empty|Remove Sp Cpp Lambda Argument List Empty|Force Sp Cpp Lambda Argument List Empty"
+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
+Choices=sp_cpp_lambda_argument_list\s*=\s*ignore|sp_cpp_lambda_argument_list\s*=\s*add|sp_cpp_lambda_argument_list\s*=\s*remove|sp_cpp_lambda_argument_list\s*=\s*force|sp_cpp_lambda_argument_list\s*=\s*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
 
@@ -215,7 +225,7 @@ 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
+Choices=sp_cpp_lambda_paren_brace\s*=\s*ignore|sp_cpp_lambda_paren_brace\s*=\s*add|sp_cpp_lambda_paren_brace\s*=\s*remove|sp_cpp_lambda_paren_brace\s*=\s*force|sp_cpp_lambda_paren_brace\s*=\s*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
 
@@ -224,7 +234,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|sp_cpp_lambda_fparen=not_defined
+Choices=sp_cpp_lambda_fparen\s*=\s*ignore|sp_cpp_lambda_fparen\s*=\s*add|sp_cpp_lambda_fparen\s*=\s*remove|sp_cpp_lambda_fparen\s*=\s*force|sp_cpp_lambda_fparen\s*=\s*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
 
@@ -233,7 +243,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|sp_assign_default=not_defined
+Choices=sp_assign_default\s*=\s*ignore|sp_assign_default\s*=\s*add|sp_assign_default\s*=\s*remove|sp_assign_default\s*=\s*force|sp_assign_default\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Assign Default|Add Sp Assign Default|Remove Sp Assign Default|Force Sp Assign Default"
 ValueDefault=ignore
 
@@ -242,7 +252,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|sp_before_assign=not_defined
+Choices=sp_before_assign\s*=\s*ignore|sp_before_assign\s*=\s*add|sp_before_assign\s*=\s*remove|sp_before_assign\s*=\s*force|sp_before_assign\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Assign|Add Sp Before Assign|Remove Sp Before Assign|Force Sp Before Assign"
 ValueDefault=ignore
 
@@ -251,7 +261,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|sp_after_assign=not_defined
+Choices=sp_after_assign\s*=\s*ignore|sp_after_assign\s*=\s*add|sp_after_assign\s*=\s*remove|sp_after_assign\s*=\s*force|sp_after_assign\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Assign|Add Sp After Assign|Remove Sp After Assign|Force Sp After Assign"
 ValueDefault=ignore
 
@@ -260,7 +270,7 @@ Category=1
 Description="<html>Add or remove space in 'enum {'.<br/><br/>Default: add</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_enum_brace=ignore|sp_enum_brace=add|sp_enum_brace=remove|sp_enum_brace=force|sp_enum_brace=not_defined
+Choices=sp_enum_brace\s*=\s*ignore|sp_enum_brace\s*=\s*add|sp_enum_brace\s*=\s*remove|sp_enum_brace\s*=\s*force|sp_enum_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Enum Brace|Add Sp Enum Brace|Remove Sp Enum Brace|Force Sp Enum Brace"
 ValueDefault=add
 
@@ -269,7 +279,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|sp_enum_paren=not_defined
+Choices=sp_enum_paren\s*=\s*ignore|sp_enum_paren\s*=\s*add|sp_enum_paren\s*=\s*remove|sp_enum_paren\s*=\s*force|sp_enum_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Enum Paren|Add Sp Enum Paren|Remove Sp Enum Paren|Force Sp Enum Paren"
 ValueDefault=ignore
 
@@ -278,7 +288,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|sp_enum_assign=not_defined
+Choices=sp_enum_assign\s*=\s*ignore|sp_enum_assign\s*=\s*add|sp_enum_assign\s*=\s*remove|sp_enum_assign\s*=\s*force|sp_enum_assign\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Enum Assign|Add Sp Enum Assign|Remove Sp Enum Assign|Force Sp Enum Assign"
 ValueDefault=ignore
 
@@ -287,7 +297,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|sp_enum_before_assign=not_defined
+Choices=sp_enum_before_assign\s*=\s*ignore|sp_enum_before_assign\s*=\s*add|sp_enum_before_assign\s*=\s*remove|sp_enum_before_assign\s*=\s*force|sp_enum_before_assign\s*=\s*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
 
@@ -296,7 +306,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|sp_enum_after_assign=not_defined
+Choices=sp_enum_after_assign\s*=\s*ignore|sp_enum_after_assign\s*=\s*add|sp_enum_after_assign\s*=\s*remove|sp_enum_after_assign\s*=\s*force|sp_enum_after_assign\s*=\s*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
 
@@ -305,7 +315,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|sp_enum_colon=not_defined
+Choices=sp_enum_colon\s*=\s*ignore|sp_enum_colon\s*=\s*add|sp_enum_colon\s*=\s*remove|sp_enum_colon\s*=\s*force|sp_enum_colon\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Enum Colon|Add Sp Enum Colon|Remove Sp Enum Colon|Force Sp Enum Colon"
 ValueDefault=ignore
 
@@ -314,7 +324,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|sp_pp_concat=not_defined
+Choices=sp_pp_concat\s*=\s*ignore|sp_pp_concat\s*=\s*add|sp_pp_concat\s*=\s*remove|sp_pp_concat\s*=\s*force|sp_pp_concat\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Pp Concat|Add Sp Pp Concat|Remove Sp Pp Concat|Force Sp Pp Concat"
 ValueDefault=add
 
@@ -323,7 +333,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|sp_pp_stringify=not_defined
+Choices=sp_pp_stringify\s*=\s*ignore|sp_pp_stringify\s*=\s*add|sp_pp_stringify\s*=\s*remove|sp_pp_stringify\s*=\s*force|sp_pp_stringify\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Pp Stringify|Add Sp Pp Stringify|Remove Sp Pp Stringify|Force Sp Pp Stringify"
 ValueDefault=ignore
 
@@ -332,7 +342,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|sp_before_pp_stringify=not_defined
+Choices=sp_before_pp_stringify\s*=\s*ignore|sp_before_pp_stringify\s*=\s*add|sp_before_pp_stringify\s*=\s*remove|sp_before_pp_stringify\s*=\s*force|sp_before_pp_stringify\s*=\s*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
 
@@ -341,7 +351,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|sp_bool=not_defined
+Choices=sp_bool\s*=\s*ignore|sp_bool\s*=\s*add|sp_bool\s*=\s*remove|sp_bool\s*=\s*force|sp_bool\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Bool|Add Sp Bool|Remove Sp Bool|Force Sp Bool"
 ValueDefault=ignore
 
@@ -350,7 +360,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|sp_compare=not_defined
+Choices=sp_compare\s*=\s*ignore|sp_compare\s*=\s*add|sp_compare\s*=\s*remove|sp_compare\s*=\s*force|sp_compare\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Compare|Add Sp Compare|Remove Sp Compare|Force Sp Compare"
 ValueDefault=ignore
 
@@ -359,7 +369,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|sp_inside_paren=not_defined
+Choices=sp_inside_paren\s*=\s*ignore|sp_inside_paren\s*=\s*add|sp_inside_paren\s*=\s*remove|sp_inside_paren\s*=\s*force|sp_inside_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Inside Paren|Add Sp Inside Paren|Remove Sp Inside Paren|Force Sp Inside Paren"
 ValueDefault=ignore
 
@@ -368,7 +378,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|sp_paren_paren=not_defined
+Choices=sp_paren_paren\s*=\s*ignore|sp_paren_paren\s*=\s*add|sp_paren_paren\s*=\s*remove|sp_paren_paren\s*=\s*force|sp_paren_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Paren Paren|Add Sp Paren Paren|Remove Sp Paren Paren|Force Sp Paren Paren"
 ValueDefault=ignore
 
@@ -377,7 +387,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|sp_cparen_oparen=not_defined
+Choices=sp_cparen_oparen\s*=\s*ignore|sp_cparen_oparen\s*=\s*add|sp_cparen_oparen\s*=\s*remove|sp_cparen_oparen\s*=\s*force|sp_cparen_oparen\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Cparen Oparen|Add Sp Cparen Oparen|Remove Sp Cparen Oparen|Force Sp Cparen Oparen"
 ValueDefault=ignore
 
@@ -386,7 +396,7 @@ 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
+TrueFalse=sp_balance_nested_parens\s*=\s*true|sp_balance_nested_parens\s*=\s*false
 ValueDefault=false
 
 [Sp Paren Brace]
@@ -394,7 +404,7 @@ 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
+Choices=sp_paren_brace\s*=\s*ignore|sp_paren_brace\s*=\s*add|sp_paren_brace\s*=\s*remove|sp_paren_brace\s*=\s*force|sp_paren_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Paren Brace|Add Sp Paren Brace|Remove Sp Paren Brace|Force Sp Paren Brace"
 ValueDefault=ignore
 
@@ -403,7 +413,7 @@ 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
+Choices=sp_brace_brace\s*=\s*ignore|sp_brace_brace\s*=\s*add|sp_brace_brace\s*=\s*remove|sp_brace_brace\s*=\s*force|sp_brace_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Brace Brace|Add Sp Brace Brace|Remove Sp Brace Brace|Force Sp Brace Brace"
 ValueDefault=ignore
 
@@ -412,7 +422,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|sp_before_ptr_star=not_defined
+Choices=sp_before_ptr_star\s*=\s*ignore|sp_before_ptr_star\s*=\s*add|sp_before_ptr_star\s*=\s*remove|sp_before_ptr_star\s*=\s*force|sp_before_ptr_star\s*=\s*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
 
@@ -421,25 +431,79 @@ 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
+Choices=sp_before_unnamed_ptr_star\s*=\s*ignore|sp_before_unnamed_ptr_star\s*=\s*add|sp_before_unnamed_ptr_star\s*=\s*remove|sp_before_unnamed_ptr_star\s*=\s*force|sp_before_unnamed_ptr_star\s*=\s*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 Before Qualifier Ptr Star]
+Category=1
+Description="<html>Add or remove space before pointer star '*' that is followed by a qualifier.<br/>If set to ignore, sp_before_unnamed_ptr_star is used instead.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_before_qualifier_ptr_star\s*=\s*ignore|sp_before_qualifier_ptr_star\s*=\s*add|sp_before_qualifier_ptr_star\s*=\s*remove|sp_before_qualifier_ptr_star\s*=\s*force|sp_before_qualifier_ptr_star\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Before Qualifier Ptr Star|Add Sp Before Qualifier Ptr Star|Remove Sp Before Qualifier Ptr Star|Force Sp Before Qualifier Ptr Star"
+ValueDefault=ignore
+
+[Sp Before Operator Ptr Star]
+Category=1
+Description="<html>Add or remove space before pointer star '*' that is followed by 'operator' keyword.<br/>If set to ignore, sp_before_unnamed_ptr_star is used instead.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_before_operator_ptr_star\s*=\s*ignore|sp_before_operator_ptr_star\s*=\s*add|sp_before_operator_ptr_star\s*=\s*remove|sp_before_operator_ptr_star\s*=\s*force|sp_before_operator_ptr_star\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Before Operator Ptr Star|Add Sp Before Operator Ptr Star|Remove Sp Before Operator Ptr Star|Force Sp Before Operator Ptr Star"
+ValueDefault=ignore
+
+[Sp Before Scope Ptr Star]
+Category=1
+Description="<html>Add or remove space before pointer star '*' that is followed by<br/>a class scope (as in 'int *MyClass::method()') or namespace scope<br/>(as in 'int *my_ns::func()').<br/>If set to ignore, sp_before_unnamed_ptr_star is used instead.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_before_scope_ptr_star\s*=\s*ignore|sp_before_scope_ptr_star\s*=\s*add|sp_before_scope_ptr_star\s*=\s*remove|sp_before_scope_ptr_star\s*=\s*force|sp_before_scope_ptr_star\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Before Scope Ptr Star|Add Sp Before Scope Ptr Star|Remove Sp Before Scope Ptr Star|Force Sp Before Scope Ptr Star"
+ValueDefault=ignore
+
+[Sp Before Global Scope Ptr Star]
+Category=1
+Description="<html>Add or remove space before pointer star '*' that is followed by '::',<br/>as in 'int *::func()'.<br/>If set to ignore, sp_before_unnamed_ptr_star is used instead.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_before_global_scope_ptr_star\s*=\s*ignore|sp_before_global_scope_ptr_star\s*=\s*add|sp_before_global_scope_ptr_star\s*=\s*remove|sp_before_global_scope_ptr_star\s*=\s*force|sp_before_global_scope_ptr_star\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Before Global Scope Ptr Star|Add Sp Before Global Scope Ptr Star|Remove Sp Before Global Scope Ptr Star|Force Sp Before Global Scope Ptr Star"
+ValueDefault=ignore
+
+[Sp Qualifier Unnamed Ptr Star]
+Category=1
+Description="<html>Add or remove space between a qualifier and a pointer star '*' that isn't<br/>followed by a variable name, as in '(char const *)'. If set to ignore,<br/>sp_before_ptr_star is used instead.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_qualifier_unnamed_ptr_star\s*=\s*ignore|sp_qualifier_unnamed_ptr_star\s*=\s*add|sp_qualifier_unnamed_ptr_star\s*=\s*remove|sp_qualifier_unnamed_ptr_star\s*=\s*force|sp_qualifier_unnamed_ptr_star\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Qualifier Unnamed Ptr Star|Add Sp Qualifier Unnamed Ptr Star|Remove Sp Qualifier Unnamed Ptr Star|Force Sp Qualifier Unnamed Ptr Star"
+ValueDefault=ignore
+
 [Sp Between Ptr Star]
 Category=1
 Description="<html>Add or remove space between pointer stars '*', as in 'int ***a;'.</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
+Choices=sp_between_ptr_star\s*=\s*ignore|sp_between_ptr_star\s*=\s*add|sp_between_ptr_star\s*=\s*remove|sp_between_ptr_star\s*=\s*force|sp_between_ptr_star\s*=\s*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 Between Ptr Ref]
+Category=1
+Description="<html>Add or remove space between pointer star '*' and reference '&amp;', as in 'int *&amp; a;'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_between_ptr_ref\s*=\s*ignore|sp_between_ptr_ref\s*=\s*add|sp_between_ptr_ref\s*=\s*remove|sp_between_ptr_ref\s*=\s*force|sp_between_ptr_ref\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Between Ptr Ref|Add Sp Between Ptr Ref|Remove Sp Between Ptr Ref|Force Sp Between Ptr Ref"
+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
+Choices=sp_after_ptr_star\s*=\s*ignore|sp_after_ptr_star\s*=\s*add|sp_after_ptr_star\s*=\s*remove|sp_after_ptr_star\s*=\s*force|sp_after_ptr_star\s*=\s*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
 
@@ -448,7 +512,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|sp_after_ptr_block_caret=not_defined
+Choices=sp_after_ptr_block_caret\s*=\s*ignore|sp_after_ptr_block_caret\s*=\s*add|sp_after_ptr_block_caret\s*=\s*remove|sp_after_ptr_block_caret\s*=\s*force|sp_after_ptr_block_caret\s*=\s*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
 
@@ -457,7 +521,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|sp_after_ptr_star_qualifier=not_defined
+Choices=sp_after_ptr_star_qualifier\s*=\s*ignore|sp_after_ptr_star_qualifier\s*=\s*add|sp_after_ptr_star_qualifier\s*=\s*remove|sp_after_ptr_star_qualifier\s*=\s*force|sp_after_ptr_star_qualifier\s*=\s*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
 
@@ -466,7 +530,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|sp_after_ptr_star_func=not_defined
+Choices=sp_after_ptr_star_func\s*=\s*ignore|sp_after_ptr_star_func\s*=\s*add|sp_after_ptr_star_func\s*=\s*remove|sp_after_ptr_star_func\s*=\s*force|sp_after_ptr_star_func\s*=\s*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
 
@@ -475,7 +539,7 @@ Category=1
 Description="<html>Add or remove space after a pointer star '*' in the trailing return of a<br/>function prototype or function definition.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_ptr_star_trailing=ignore|sp_after_ptr_star_trailing=add|sp_after_ptr_star_trailing=remove|sp_after_ptr_star_trailing=force|sp_after_ptr_star_trailing=not_defined
+Choices=sp_after_ptr_star_trailing\s*=\s*ignore|sp_after_ptr_star_trailing\s*=\s*add|sp_after_ptr_star_trailing\s*=\s*remove|sp_after_ptr_star_trailing\s*=\s*force|sp_after_ptr_star_trailing\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Ptr Star Trailing|Add Sp After Ptr Star Trailing|Remove Sp After Ptr Star Trailing|Force Sp After Ptr Star Trailing"
 ValueDefault=ignore
 
@@ -484,7 +548,7 @@ Category=1
 Description="<html>Add or remove space between the pointer star '*' and the name of the variable<br/>in a function pointer definition.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_ptr_star_func_var=ignore|sp_ptr_star_func_var=add|sp_ptr_star_func_var=remove|sp_ptr_star_func_var=force|sp_ptr_star_func_var=not_defined
+Choices=sp_ptr_star_func_var\s*=\s*ignore|sp_ptr_star_func_var\s*=\s*add|sp_ptr_star_func_var\s*=\s*remove|sp_ptr_star_func_var\s*=\s*force|sp_ptr_star_func_var\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Ptr Star Func Var|Add Sp Ptr Star Func Var|Remove Sp Ptr Star Func Var|Force Sp Ptr Star Func Var"
 ValueDefault=ignore
 
@@ -493,7 +557,7 @@ Category=1
 Description="<html>Add or remove space between the pointer star '*' and the name of the type<br/>in a function pointer type definition.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_ptr_star_func_type=ignore|sp_ptr_star_func_type=add|sp_ptr_star_func_type=remove|sp_ptr_star_func_type=force|sp_ptr_star_func_type=not_defined
+Choices=sp_ptr_star_func_type\s*=\s*ignore|sp_ptr_star_func_type\s*=\s*add|sp_ptr_star_func_type\s*=\s*remove|sp_ptr_star_func_type\s*=\s*force|sp_ptr_star_func_type\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Ptr Star Func Type|Add Sp Ptr Star Func Type|Remove Sp Ptr Star Func Type|Force Sp Ptr Star Func Type"
 ValueDefault=ignore
 
@@ -502,34 +566,52 @@ 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
+Choices=sp_ptr_star_paren\s*=\s*ignore|sp_ptr_star_paren\s*=\s*add|sp_ptr_star_paren\s*=\s*remove|sp_ptr_star_paren\s*=\s*force|sp_ptr_star_paren\s*=\s*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>"
+Description="<html>Add or remove space before a pointer star '*', if followed by a function<br/>prototype or function definition. If set to ignore, sp_before_ptr_star is<br/>used instead.</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
+Choices=sp_before_ptr_star_func\s*=\s*ignore|sp_before_ptr_star_func\s*=\s*add|sp_before_ptr_star_func\s*=\s*remove|sp_before_ptr_star_func\s*=\s*force|sp_before_ptr_star_func\s*=\s*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 Qualifier Ptr Star Func]
+Category=1
+Description="<html>Add or remove space between a qualifier and a pointer star '*' followed by<br/>the name of the function in a function prototype or definition, as in<br/>'char const *foo()`. If set to ignore, sp_before_ptr_star is used instead.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_qualifier_ptr_star_func\s*=\s*ignore|sp_qualifier_ptr_star_func\s*=\s*add|sp_qualifier_ptr_star_func\s*=\s*remove|sp_qualifier_ptr_star_func\s*=\s*force|sp_qualifier_ptr_star_func\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Qualifier Ptr Star Func|Add Sp Qualifier Ptr Star Func|Remove Sp Qualifier Ptr Star Func|Force Sp Qualifier Ptr Star Func"
+ValueDefault=ignore
+
 [Sp Before Ptr Star Trailing]
 Category=1
 Description="<html>Add or remove space before a pointer star '*' in the trailing return of a<br/>function prototype or function definition.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_ptr_star_trailing=ignore|sp_before_ptr_star_trailing=add|sp_before_ptr_star_trailing=remove|sp_before_ptr_star_trailing=force|sp_before_ptr_star_trailing=not_defined
+Choices=sp_before_ptr_star_trailing\s*=\s*ignore|sp_before_ptr_star_trailing\s*=\s*add|sp_before_ptr_star_trailing\s*=\s*remove|sp_before_ptr_star_trailing\s*=\s*force|sp_before_ptr_star_trailing\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Ptr Star Trailing|Add Sp Before Ptr Star Trailing|Remove Sp Before Ptr Star Trailing|Force Sp Before Ptr Star Trailing"
 ValueDefault=ignore
 
+[Sp Qualifier Ptr Star Trailing]
+Category=1
+Description="<html>Add or remove space between a qualifier and a pointer star '*' in the<br/>trailing return of a function prototype or function definition, as in<br/>'auto foo() -&gt; char const *'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_qualifier_ptr_star_trailing\s*=\s*ignore|sp_qualifier_ptr_star_trailing\s*=\s*add|sp_qualifier_ptr_star_trailing\s*=\s*remove|sp_qualifier_ptr_star_trailing\s*=\s*force|sp_qualifier_ptr_star_trailing\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Qualifier Ptr Star Trailing|Add Sp Qualifier Ptr Star Trailing|Remove Sp Qualifier Ptr Star Trailing|Force Sp Qualifier Ptr Star Trailing"
+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
+Choices=sp_before_byref\s*=\s*ignore|sp_before_byref\s*=\s*add|sp_before_byref\s*=\s*remove|sp_before_byref\s*=\s*force|sp_before_byref\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Byref|Add Sp Before Byref|Remove Sp Before Byref|Force Sp Before Byref"
 ValueDefault=ignore
 
@@ -538,7 +620,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|sp_before_unnamed_byref=not_defined
+Choices=sp_before_unnamed_byref\s*=\s*ignore|sp_before_unnamed_byref\s*=\s*add|sp_before_unnamed_byref\s*=\s*remove|sp_before_unnamed_byref\s*=\s*force|sp_before_unnamed_byref\s*=\s*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
 
@@ -547,7 +629,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|sp_after_byref=not_defined
+Choices=sp_after_byref\s*=\s*ignore|sp_after_byref\s*=\s*add|sp_after_byref\s*=\s*remove|sp_after_byref\s*=\s*force|sp_after_byref\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Byref|Add Sp After Byref|Remove Sp After Byref|Force Sp After Byref"
 ValueDefault=ignore
 
@@ -556,7 +638,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|sp_after_byref_func=not_defined
+Choices=sp_after_byref_func\s*=\s*ignore|sp_after_byref_func\s*=\s*add|sp_after_byref_func\s*=\s*remove|sp_after_byref_func\s*=\s*force|sp_after_byref_func\s*=\s*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
 
@@ -565,7 +647,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|sp_before_byref_func=not_defined
+Choices=sp_before_byref_func\s*=\s*ignore|sp_before_byref_func\s*=\s*add|sp_before_byref_func\s*=\s*remove|sp_before_byref_func\s*=\s*force|sp_before_byref_func\s*=\s*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
 
@@ -574,7 +656,7 @@ Category=1
 Description="<html>Add or remove space after a reference sign '&amp;', if followed by an open<br/>parenthesis, as in 'char&amp; (*)()'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_byref_paren=ignore|sp_byref_paren=add|sp_byref_paren=remove|sp_byref_paren=force|sp_byref_paren=not_defined
+Choices=sp_byref_paren\s*=\s*ignore|sp_byref_paren\s*=\s*add|sp_byref_paren\s*=\s*remove|sp_byref_paren\s*=\s*force|sp_byref_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Byref Paren|Add Sp Byref Paren|Remove Sp Byref Paren|Force Sp Byref Paren"
 ValueDefault=ignore
 
@@ -583,7 +665,7 @@ 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
+Choices=sp_after_type\s*=\s*ignore|sp_after_type\s*=\s*add|sp_after_type\s*=\s*remove|sp_after_type\s*=\s*force|sp_after_type\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Type|Add Sp After Type|Remove Sp After Type|Force Sp After Type"
 ValueDefault=force
 
@@ -592,7 +674,7 @@ 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
+Choices=sp_after_decltype\s*=\s*ignore|sp_after_decltype\s*=\s*add|sp_after_decltype\s*=\s*remove|sp_after_decltype\s*=\s*force|sp_after_decltype\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Decltype|Add Sp After Decltype|Remove Sp After Decltype|Force Sp After Decltype"
 ValueDefault=ignore
 
@@ -601,7 +683,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|sp_before_template_paren=not_defined
+Choices=sp_before_template_paren\s*=\s*ignore|sp_before_template_paren\s*=\s*add|sp_before_template_paren\s*=\s*remove|sp_before_template_paren\s*=\s*force|sp_before_template_paren\s*=\s*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
 
@@ -610,7 +692,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|sp_template_angle=not_defined
+Choices=sp_template_angle\s*=\s*ignore|sp_template_angle\s*=\s*add|sp_template_angle\s*=\s*remove|sp_template_angle\s*=\s*force|sp_template_angle\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Template Angle|Add Sp Template Angle|Remove Sp Template Angle|Force Sp Template Angle"
 ValueDefault=ignore
 
@@ -619,7 +701,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|sp_before_angle=not_defined
+Choices=sp_before_angle\s*=\s*ignore|sp_before_angle\s*=\s*add|sp_before_angle\s*=\s*remove|sp_before_angle\s*=\s*force|sp_before_angle\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Angle|Add Sp Before Angle|Remove Sp Before Angle|Force Sp Before Angle"
 ValueDefault=ignore
 
@@ -628,16 +710,16 @@ 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
+Choices=sp_inside_angle\s*=\s*ignore|sp_inside_angle\s*=\s*add|sp_inside_angle\s*=\s*remove|sp_inside_angle\s*=\s*force|sp_inside_angle\s*=\s*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>"
+Description="<html>Add or remove space inside '&lt;&gt;'.<br/>if empty.</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
+Choices=sp_inside_angle_empty\s*=\s*ignore|sp_inside_angle_empty\s*=\s*add|sp_inside_angle_empty\s*=\s*remove|sp_inside_angle_empty\s*=\s*force|sp_inside_angle_empty\s*=\s*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
 
@@ -646,7 +728,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|sp_angle_colon=not_defined
+Choices=sp_angle_colon\s*=\s*ignore|sp_angle_colon\s*=\s*add|sp_angle_colon\s*=\s*remove|sp_angle_colon\s*=\s*force|sp_angle_colon\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Angle Colon|Add Sp Angle Colon|Remove Sp Angle Colon|Force Sp Angle Colon"
 ValueDefault=ignore
 
@@ -655,7 +737,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|sp_after_angle=not_defined
+Choices=sp_after_angle\s*=\s*ignore|sp_after_angle\s*=\s*add|sp_after_angle\s*=\s*remove|sp_after_angle\s*=\s*force|sp_after_angle\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Angle|Add Sp After Angle|Remove Sp After Angle|Force Sp After Angle"
 ValueDefault=ignore
 
@@ -664,7 +746,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|sp_angle_paren=not_defined
+Choices=sp_angle_paren\s*=\s*ignore|sp_angle_paren\s*=\s*add|sp_angle_paren\s*=\s*remove|sp_angle_paren\s*=\s*force|sp_angle_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Angle Paren|Add Sp Angle Paren|Remove Sp Angle Paren|Force Sp Angle Paren"
 ValueDefault=ignore
 
@@ -673,7 +755,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|sp_angle_paren_empty=not_defined
+Choices=sp_angle_paren_empty\s*=\s*ignore|sp_angle_paren_empty\s*=\s*add|sp_angle_paren_empty\s*=\s*remove|sp_angle_paren_empty\s*=\s*force|sp_angle_paren_empty\s*=\s*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
 
@@ -682,7 +764,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|sp_angle_word=not_defined
+Choices=sp_angle_word\s*=\s*ignore|sp_angle_word\s*=\s*add|sp_angle_word\s*=\s*remove|sp_angle_word\s*=\s*force|sp_angle_word\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Angle Word|Add Sp Angle Word|Remove Sp Angle Word|Force Sp Angle Word"
 ValueDefault=ignore
 
@@ -691,7 +773,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|sp_angle_shift=not_defined
+Choices=sp_angle_shift\s*=\s*ignore|sp_angle_shift\s*=\s*add|sp_angle_shift\s*=\s*remove|sp_angle_shift\s*=\s*force|sp_angle_shift\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Angle Shift|Add Sp Angle Shift|Remove Sp Angle Shift|Force Sp Angle Shift"
 ValueDefault=add
 
@@ -700,7 +782,7 @@ 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
+TrueFalse=sp_permit_cpp11_shift\s*=\s*true|sp_permit_cpp11_shift\s*=\s*false
 ValueDefault=false
 
 [Sp Before Sparen]
@@ -708,7 +790,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|sp_before_sparen=not_defined
+Choices=sp_before_sparen\s*=\s*ignore|sp_before_sparen\s*=\s*add|sp_before_sparen\s*=\s*remove|sp_before_sparen\s*=\s*force|sp_before_sparen\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Sparen|Add Sp Before Sparen|Remove Sp Before Sparen|Force Sp Before Sparen"
 ValueDefault=ignore
 
@@ -717,7 +799,7 @@ Category=1
 Description="<html>Add or remove space inside '(' and ')' of control statements other than<br/>'for'.</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
+Choices=sp_inside_sparen\s*=\s*ignore|sp_inside_sparen\s*=\s*add|sp_inside_sparen\s*=\s*remove|sp_inside_sparen\s*=\s*force|sp_inside_sparen\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Inside Sparen|Add Sp Inside Sparen|Remove Sp Inside Sparen|Force Sp Inside Sparen"
 ValueDefault=ignore
 
@@ -726,7 +808,7 @@ Category=1
 Description="<html>Add or remove space after '(' of control statements other than 'for'.<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
+Choices=sp_inside_sparen_open\s*=\s*ignore|sp_inside_sparen_open\s*=\s*add|sp_inside_sparen_open\s*=\s*remove|sp_inside_sparen_open\s*=\s*force|sp_inside_sparen_open\s*=\s*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
 
@@ -735,7 +817,7 @@ Category=1
 Description="<html>Add or remove space before ')' of control statements other than 'for'.<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
+Choices=sp_inside_sparen_close\s*=\s*ignore|sp_inside_sparen_close\s*=\s*add|sp_inside_sparen_close\s*=\s*remove|sp_inside_sparen_close\s*=\s*force|sp_inside_sparen_close\s*=\s*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
 
@@ -744,7 +826,7 @@ Category=1
 Description="<html>Add or remove space inside '(' and ')' of 'for' statements.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_inside_for=ignore|sp_inside_for=add|sp_inside_for=remove|sp_inside_for=force|sp_inside_for=not_defined
+Choices=sp_inside_for\s*=\s*ignore|sp_inside_for\s*=\s*add|sp_inside_for\s*=\s*remove|sp_inside_for\s*=\s*force|sp_inside_for\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Inside For|Add Sp Inside For|Remove Sp Inside For|Force Sp Inside For"
 ValueDefault=ignore
 
@@ -753,7 +835,7 @@ Category=1
 Description="<html>Add or remove space after '(' of 'for' statements.<br/><br/>Overrides sp_inside_for.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_inside_for_open=ignore|sp_inside_for_open=add|sp_inside_for_open=remove|sp_inside_for_open=force|sp_inside_for_open=not_defined
+Choices=sp_inside_for_open\s*=\s*ignore|sp_inside_for_open\s*=\s*add|sp_inside_for_open\s*=\s*remove|sp_inside_for_open\s*=\s*force|sp_inside_for_open\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Inside For Open|Add Sp Inside For Open|Remove Sp Inside For Open|Force Sp Inside For Open"
 ValueDefault=ignore
 
@@ -762,7 +844,7 @@ Category=1
 Description="<html>Add or remove space before ')' of 'for' statements.<br/><br/>Overrides sp_inside_for.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_inside_for_close=ignore|sp_inside_for_close=add|sp_inside_for_close=remove|sp_inside_for_close=force|sp_inside_for_close=not_defined
+Choices=sp_inside_for_close\s*=\s*ignore|sp_inside_for_close\s*=\s*add|sp_inside_for_close\s*=\s*remove|sp_inside_for_close\s*=\s*force|sp_inside_for_close\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Inside For Close|Add Sp Inside For Close|Remove Sp Inside For Close|Force Sp Inside For Close"
 ValueDefault=ignore
 
@@ -771,7 +853,7 @@ Category=1
 Description="<html>Add or remove space between '((' or '))' of control statements.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_sparen_paren=ignore|sp_sparen_paren=add|sp_sparen_paren=remove|sp_sparen_paren=force|sp_sparen_paren=not_defined
+Choices=sp_sparen_paren\s*=\s*ignore|sp_sparen_paren\s*=\s*add|sp_sparen_paren\s*=\s*remove|sp_sparen_paren\s*=\s*force|sp_sparen_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Sparen Paren|Add Sp Sparen Paren|Remove Sp Sparen Paren|Force Sp Sparen Paren"
 ValueDefault=ignore
 
@@ -780,7 +862,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|sp_after_sparen=not_defined
+Choices=sp_after_sparen\s*=\s*ignore|sp_after_sparen\s*=\s*add|sp_after_sparen\s*=\s*remove|sp_after_sparen\s*=\s*force|sp_after_sparen\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Sparen|Add Sp After Sparen|Remove Sp After Sparen|Force Sp After Sparen"
 ValueDefault=ignore
 
@@ -789,7 +871,7 @@ Category=1
 Description="<html>Add or remove space between ')' and '{' 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
+Choices=sp_sparen_brace\s*=\s*ignore|sp_sparen_brace\s*=\s*add|sp_sparen_brace\s*=\s*remove|sp_sparen_brace\s*=\s*force|sp_sparen_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Sparen Brace|Add Sp Sparen Brace|Remove Sp Sparen Brace|Force Sp Sparen Brace"
 ValueDefault=ignore
 
@@ -798,7 +880,7 @@ 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
+Choices=sp_do_brace_open\s*=\s*ignore|sp_do_brace_open\s*=\s*add|sp_do_brace_open\s*=\s*remove|sp_do_brace_open\s*=\s*force|sp_do_brace_open\s*=\s*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
 
@@ -807,7 +889,7 @@ 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
+Choices=sp_brace_close_while\s*=\s*ignore|sp_brace_close_while\s*=\s*add|sp_brace_close_while\s*=\s*remove|sp_brace_close_while\s*=\s*force|sp_brace_close_while\s*=\s*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
 
@@ -816,7 +898,7 @@ 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
+Choices=sp_while_paren_open\s*=\s*ignore|sp_while_paren_open\s*=\s*add|sp_while_paren_open\s*=\s*remove|sp_while_paren_open\s*=\s*force|sp_while_paren_open\s*=\s*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
 
@@ -825,7 +907,7 @@ 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
+Choices=sp_invariant_paren\s*=\s*ignore|sp_invariant_paren\s*=\s*add|sp_invariant_paren\s*=\s*remove|sp_invariant_paren\s*=\s*force|sp_invariant_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Invariant Paren|Add Sp Invariant Paren|Remove Sp Invariant Paren|Force Sp Invariant Paren"
 ValueDefault=ignore
 
@@ -834,7 +916,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|sp_after_invariant_paren=not_defined
+Choices=sp_after_invariant_paren\s*=\s*ignore|sp_after_invariant_paren\s*=\s*add|sp_after_invariant_paren\s*=\s*remove|sp_after_invariant_paren\s*=\s*force|sp_after_invariant_paren\s*=\s*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
 
@@ -843,7 +925,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|sp_special_semi=not_defined
+Choices=sp_special_semi\s*=\s*ignore|sp_special_semi\s*=\s*add|sp_special_semi\s*=\s*remove|sp_special_semi\s*=\s*force|sp_special_semi\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Special Semi|Add Sp Special Semi|Remove Sp Special Semi|Force Sp Special Semi"
 ValueDefault=ignore
 
@@ -852,7 +934,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|sp_before_semi=not_defined
+Choices=sp_before_semi\s*=\s*ignore|sp_before_semi\s*=\s*add|sp_before_semi\s*=\s*remove|sp_before_semi\s*=\s*force|sp_before_semi\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Semi|Add Sp Before Semi|Remove Sp Before Semi|Force Sp Before Semi"
 ValueDefault=remove
 
@@ -861,7 +943,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|sp_before_semi_for=not_defined
+Choices=sp_before_semi_for\s*=\s*ignore|sp_before_semi_for\s*=\s*add|sp_before_semi_for\s*=\s*remove|sp_before_semi_for\s*=\s*force|sp_before_semi_for\s*=\s*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
 
@@ -870,7 +952,7 @@ Category=1
 Description="<html>Add or remove space before a semicolon of an empty left part of a for<br/>statement, as in 'for ( &lt;here&gt; ; ; )'.</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
+Choices=sp_before_semi_for_empty\s*=\s*ignore|sp_before_semi_for_empty\s*=\s*add|sp_before_semi_for_empty\s*=\s*remove|sp_before_semi_for_empty\s*=\s*force|sp_before_semi_for_empty\s*=\s*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
 
@@ -879,7 +961,7 @@ Category=1
 Description="<html>Add or remove space between the semicolons of an empty middle part of a for<br/>statement, as in 'for ( ; &lt;here&gt; ; )'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_between_semi_for_empty=ignore|sp_between_semi_for_empty=add|sp_between_semi_for_empty=remove|sp_between_semi_for_empty=force|sp_between_semi_for_empty=not_defined
+Choices=sp_between_semi_for_empty\s*=\s*ignore|sp_between_semi_for_empty\s*=\s*add|sp_between_semi_for_empty\s*=\s*remove|sp_between_semi_for_empty\s*=\s*force|sp_between_semi_for_empty\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Between Semi For Empty|Add Sp Between Semi For Empty|Remove Sp Between Semi For Empty|Force Sp Between Semi For Empty"
 ValueDefault=ignore
 
@@ -888,7 +970,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|sp_after_semi=not_defined
+Choices=sp_after_semi\s*=\s*ignore|sp_after_semi\s*=\s*add|sp_after_semi\s*=\s*remove|sp_after_semi\s*=\s*force|sp_after_semi\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Semi|Add Sp After Semi|Remove Sp After Semi|Force Sp After Semi"
 ValueDefault=add
 
@@ -897,7 +979,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|sp_after_semi_for=not_defined
+Choices=sp_after_semi_for\s*=\s*ignore|sp_after_semi_for\s*=\s*add|sp_after_semi_for\s*=\s*remove|sp_after_semi_for\s*=\s*force|sp_after_semi_for\s*=\s*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
 
@@ -906,7 +988,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|sp_after_semi_for_empty=not_defined
+Choices=sp_after_semi_for_empty\s*=\s*ignore|sp_after_semi_for_empty\s*=\s*add|sp_after_semi_for_empty\s*=\s*remove|sp_after_semi_for_empty\s*=\s*force|sp_after_semi_for_empty\s*=\s*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
 
@@ -915,7 +997,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|sp_before_square=not_defined
+Choices=sp_before_square\s*=\s*ignore|sp_before_square\s*=\s*add|sp_before_square\s*=\s*remove|sp_before_square\s*=\s*force|sp_before_square\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Square|Add Sp Before Square|Remove Sp Before Square|Force Sp Before Square"
 ValueDefault=ignore
 
@@ -924,7 +1006,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|sp_before_vardef_square=not_defined
+Choices=sp_before_vardef_square\s*=\s*ignore|sp_before_vardef_square\s*=\s*add|sp_before_vardef_square\s*=\s*remove|sp_before_vardef_square\s*=\s*force|sp_before_vardef_square\s*=\s*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
 
@@ -933,7 +1015,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|sp_before_square_asm_block=not_defined
+Choices=sp_before_square_asm_block\s*=\s*ignore|sp_before_square_asm_block\s*=\s*add|sp_before_square_asm_block\s*=\s*remove|sp_before_square_asm_block\s*=\s*force|sp_before_square_asm_block\s*=\s*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
 
@@ -942,7 +1024,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|sp_before_squares=not_defined
+Choices=sp_before_squares\s*=\s*ignore|sp_before_squares\s*=\s*add|sp_before_squares\s*=\s*remove|sp_before_squares\s*=\s*force|sp_before_squares\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Squares|Add Sp Before Squares|Remove Sp Before Squares|Force Sp Before Squares"
 ValueDefault=ignore
 
@@ -951,7 +1033,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|sp_cpp_before_struct_binding=not_defined
+Choices=sp_cpp_before_struct_binding\s*=\s*ignore|sp_cpp_before_struct_binding\s*=\s*add|sp_cpp_before_struct_binding\s*=\s*remove|sp_cpp_before_struct_binding\s*=\s*force|sp_cpp_before_struct_binding\s*=\s*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
 
@@ -960,16 +1042,16 @@ 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
+Choices=sp_inside_square\s*=\s*ignore|sp_inside_square\s*=\s*add|sp_inside_square\s*=\s*remove|sp_inside_square\s*=\s*force|sp_inside_square\s*=\s*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>"
+Description="<html>Add or remove space inside '[]'.<br/>if empty.</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
+Choices=sp_inside_square_empty\s*=\s*ignore|sp_inside_square_empty\s*=\s*add|sp_inside_square_empty\s*=\s*remove|sp_inside_square_empty\s*=\s*force|sp_inside_square_empty\s*=\s*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
 
@@ -978,7 +1060,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|sp_inside_square_oc_array=not_defined
+Choices=sp_inside_square_oc_array\s*=\s*ignore|sp_inside_square_oc_array\s*=\s*add|sp_inside_square_oc_array\s*=\s*remove|sp_inside_square_oc_array\s*=\s*force|sp_inside_square_oc_array\s*=\s*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
 
@@ -987,7 +1069,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|sp_after_comma=not_defined
+Choices=sp_after_comma\s*=\s*ignore|sp_after_comma\s*=\s*add|sp_after_comma\s*=\s*remove|sp_after_comma\s*=\s*force|sp_after_comma\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Comma|Add Sp After Comma|Remove Sp After Comma|Force Sp After Comma"
 ValueDefault=ignore
 
@@ -996,7 +1078,7 @@ Category=1
 Description="<html>Add or remove space before ',', i.e. 'a,b' vs. 'a ,b'.<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
+Choices=sp_before_comma\s*=\s*ignore|sp_before_comma\s*=\s*add|sp_before_comma\s*=\s*remove|sp_before_comma\s*=\s*force|sp_before_comma\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Comma|Add Sp Before Comma|Remove Sp Before Comma|Force Sp Before Comma"
 ValueDefault=remove
 
@@ -1005,7 +1087,7 @@ Category=1
 Description="<html>(C#, Vala) 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
+Choices=sp_after_mdatype_commas\s*=\s*ignore|sp_after_mdatype_commas\s*=\s*add|sp_after_mdatype_commas\s*=\s*remove|sp_after_mdatype_commas\s*=\s*force|sp_after_mdatype_commas\s*=\s*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
 
@@ -1014,7 +1096,7 @@ Category=1
 Description="<html>(C#, Vala) 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
+Choices=sp_before_mdatype_commas\s*=\s*ignore|sp_before_mdatype_commas\s*=\s*add|sp_before_mdatype_commas\s*=\s*remove|sp_before_mdatype_commas\s*=\s*force|sp_before_mdatype_commas\s*=\s*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
 
@@ -1023,7 +1105,7 @@ Category=1
 Description="<html>(C#, Vala) 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
+Choices=sp_between_mdatype_commas\s*=\s*ignore|sp_between_mdatype_commas\s*=\s*add|sp_between_mdatype_commas\s*=\s*remove|sp_between_mdatype_commas\s*=\s*force|sp_between_mdatype_commas\s*=\s*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
 
@@ -1032,7 +1114,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|sp_paren_comma=not_defined
+Choices=sp_paren_comma\s*=\s*ignore|sp_paren_comma\s*=\s*add|sp_paren_comma\s*=\s*remove|sp_paren_comma\s*=\s*force|sp_paren_comma\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Paren Comma|Add Sp Paren Comma|Remove Sp Paren Comma|Force Sp Paren Comma"
 ValueDefault=force
 
@@ -1041,7 +1123,7 @@ Category=1
 Description="<html>Add or remove space between a type and ':'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_type_colon=ignore|sp_type_colon=add|sp_type_colon=remove|sp_type_colon=force|sp_type_colon=not_defined
+Choices=sp_type_colon\s*=\s*ignore|sp_type_colon\s*=\s*add|sp_type_colon\s*=\s*remove|sp_type_colon\s*=\s*force|sp_type_colon\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Type Colon|Add Sp Type Colon|Remove Sp Type Colon|Force Sp Type Colon"
 ValueDefault=ignore
 
@@ -1050,7 +1132,7 @@ Category=1
 Description="<html>Add or remove space after the variadic '...' when preceded by a<br/>non-punctuator.<br/>The value REMOVE will be overridden with FORCE</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_ellipsis=ignore|sp_after_ellipsis=add|sp_after_ellipsis=remove|sp_after_ellipsis=force|sp_after_ellipsis=not_defined
+Choices=sp_after_ellipsis\s*=\s*ignore|sp_after_ellipsis\s*=\s*add|sp_after_ellipsis\s*=\s*remove|sp_after_ellipsis\s*=\s*force|sp_after_ellipsis\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Ellipsis|Add Sp After Ellipsis|Remove Sp After Ellipsis|Force Sp After Ellipsis"
 ValueDefault=ignore
 
@@ -1059,7 +1141,7 @@ Category=1
 Description="<html>Add or remove space before the variadic '...' when preceded by a<br/>non-punctuator.<br/>The value REMOVE will be overridden with FORCE</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
+Choices=sp_before_ellipsis\s*=\s*ignore|sp_before_ellipsis\s*=\s*add|sp_before_ellipsis\s*=\s*remove|sp_before_ellipsis\s*=\s*force|sp_before_ellipsis\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Ellipsis|Add Sp Before Ellipsis|Remove Sp Before Ellipsis|Force Sp Before Ellipsis"
 ValueDefault=ignore
 
@@ -1068,7 +1150,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|sp_type_ellipsis=not_defined
+Choices=sp_type_ellipsis\s*=\s*ignore|sp_type_ellipsis\s*=\s*add|sp_type_ellipsis\s*=\s*remove|sp_type_ellipsis\s*=\s*force|sp_type_ellipsis\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Type Ellipsis|Add Sp Type Ellipsis|Remove Sp Type Ellipsis|Force Sp Type Ellipsis"
 ValueDefault=ignore
 
@@ -1077,7 +1159,7 @@ Category=1
 Description="<html>Add or remove space between a '*' and '...'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_ptr_type_ellipsis=ignore|sp_ptr_type_ellipsis=add|sp_ptr_type_ellipsis=remove|sp_ptr_type_ellipsis=force|sp_ptr_type_ellipsis=not_defined
+Choices=sp_ptr_type_ellipsis\s*=\s*ignore|sp_ptr_type_ellipsis\s*=\s*add|sp_ptr_type_ellipsis\s*=\s*remove|sp_ptr_type_ellipsis\s*=\s*force|sp_ptr_type_ellipsis\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Ptr Type Ellipsis|Add Sp Ptr Type Ellipsis|Remove Sp Ptr Type Ellipsis|Force Sp Ptr Type Ellipsis"
 ValueDefault=ignore
 
@@ -1086,7 +1168,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|sp_paren_ellipsis=not_defined
+Choices=sp_paren_ellipsis\s*=\s*ignore|sp_paren_ellipsis\s*=\s*add|sp_paren_ellipsis\s*=\s*remove|sp_paren_ellipsis\s*=\s*force|sp_paren_ellipsis\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Paren Ellipsis|Add Sp Paren Ellipsis|Remove Sp Paren Ellipsis|Force Sp Paren Ellipsis"
 ValueDefault=ignore
 
@@ -1095,7 +1177,7 @@ Category=1
 Description="<html>Add or remove space between '&amp;&amp;' and '...'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_byref_ellipsis=ignore|sp_byref_ellipsis=add|sp_byref_ellipsis=remove|sp_byref_ellipsis=force|sp_byref_ellipsis=not_defined
+Choices=sp_byref_ellipsis\s*=\s*ignore|sp_byref_ellipsis\s*=\s*add|sp_byref_ellipsis\s*=\s*remove|sp_byref_ellipsis\s*=\s*force|sp_byref_ellipsis\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Byref Ellipsis|Add Sp Byref Ellipsis|Remove Sp Byref Ellipsis|Force Sp Byref Ellipsis"
 ValueDefault=ignore
 
@@ -1104,7 +1186,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|sp_paren_qualifier=not_defined
+Choices=sp_paren_qualifier\s*=\s*ignore|sp_paren_qualifier\s*=\s*add|sp_paren_qualifier\s*=\s*remove|sp_paren_qualifier\s*=\s*force|sp_paren_qualifier\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Paren Qualifier|Add Sp Paren Qualifier|Remove Sp Paren Qualifier|Force Sp Paren Qualifier"
 ValueDefault=ignore
 
@@ -1113,7 +1195,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|sp_paren_noexcept=not_defined
+Choices=sp_paren_noexcept\s*=\s*ignore|sp_paren_noexcept\s*=\s*add|sp_paren_noexcept\s*=\s*remove|sp_paren_noexcept\s*=\s*force|sp_paren_noexcept\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Paren Noexcept|Add Sp Paren Noexcept|Remove Sp Paren Noexcept|Force Sp Paren Noexcept"
 ValueDefault=ignore
 
@@ -1122,7 +1204,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|sp_after_class_colon=not_defined
+Choices=sp_after_class_colon\s*=\s*ignore|sp_after_class_colon\s*=\s*add|sp_after_class_colon\s*=\s*remove|sp_after_class_colon\s*=\s*force|sp_after_class_colon\s*=\s*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
 
@@ -1131,7 +1213,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|sp_before_class_colon=not_defined
+Choices=sp_before_class_colon\s*=\s*ignore|sp_before_class_colon\s*=\s*add|sp_before_class_colon\s*=\s*remove|sp_before_class_colon\s*=\s*force|sp_before_class_colon\s*=\s*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
 
@@ -1140,7 +1222,7 @@ Category=1
 Description="<html>Add or remove space after class constructor ':'.<br/><br/>Default: add</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
+Choices=sp_after_constr_colon\s*=\s*ignore|sp_after_constr_colon\s*=\s*add|sp_after_constr_colon\s*=\s*remove|sp_after_constr_colon\s*=\s*force|sp_after_constr_colon\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Constr Colon|Add Sp After Constr Colon|Remove Sp After Constr Colon|Force Sp After Constr Colon"
 ValueDefault=add
 
@@ -1149,7 +1231,7 @@ Category=1
 Description="<html>Add or remove space before class constructor ':'.<br/><br/>Default: add</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
+Choices=sp_before_constr_colon\s*=\s*ignore|sp_before_constr_colon\s*=\s*add|sp_before_constr_colon\s*=\s*remove|sp_before_constr_colon\s*=\s*force|sp_before_constr_colon\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Constr Colon|Add Sp Before Constr Colon|Remove Sp Before Constr Colon|Force Sp Before Constr Colon"
 ValueDefault=add
 
@@ -1158,7 +1240,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|sp_before_case_colon=not_defined
+Choices=sp_before_case_colon\s*=\s*ignore|sp_before_case_colon\s*=\s*add|sp_before_case_colon\s*=\s*remove|sp_before_case_colon\s*=\s*force|sp_before_case_colon\s*=\s*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
 
@@ -1167,7 +1249,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|sp_after_operator=not_defined
+Choices=sp_after_operator\s*=\s*ignore|sp_after_operator\s*=\s*add|sp_after_operator\s*=\s*remove|sp_after_operator\s*=\s*force|sp_after_operator\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Operator|Add Sp After Operator|Remove Sp After Operator|Force Sp After Operator"
 ValueDefault=ignore
 
@@ -1176,7 +1258,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|sp_after_operator_sym=not_defined
+Choices=sp_after_operator_sym\s*=\s*ignore|sp_after_operator_sym\s*=\s*add|sp_after_operator_sym\s*=\s*remove|sp_after_operator_sym\s*=\s*force|sp_after_operator_sym\s*=\s*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
 
@@ -1185,7 +1267,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|sp_after_operator_sym_empty=not_defined
+Choices=sp_after_operator_sym_empty\s*=\s*ignore|sp_after_operator_sym_empty\s*=\s*add|sp_after_operator_sym_empty\s*=\s*remove|sp_after_operator_sym_empty\s*=\s*force|sp_after_operator_sym_empty\s*=\s*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
 
@@ -1194,7 +1276,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|sp_after_cast=not_defined
+Choices=sp_after_cast\s*=\s*ignore|sp_after_cast\s*=\s*add|sp_after_cast\s*=\s*remove|sp_after_cast\s*=\s*force|sp_after_cast\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Cast|Add Sp After Cast|Remove Sp After Cast|Force Sp After Cast"
 ValueDefault=ignore
 
@@ -1203,7 +1285,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|sp_inside_paren_cast=not_defined
+Choices=sp_inside_paren_cast\s*=\s*ignore|sp_inside_paren_cast\s*=\s*add|sp_inside_paren_cast\s*=\s*remove|sp_inside_paren_cast\s*=\s*force|sp_inside_paren_cast\s*=\s*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
 
@@ -1212,7 +1294,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|sp_cpp_cast_paren=not_defined
+Choices=sp_cpp_cast_paren\s*=\s*ignore|sp_cpp_cast_paren\s*=\s*add|sp_cpp_cast_paren\s*=\s*remove|sp_cpp_cast_paren\s*=\s*force|sp_cpp_cast_paren\s*=\s*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
 
@@ -1221,7 +1303,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|sp_sizeof_paren=not_defined
+Choices=sp_sizeof_paren\s*=\s*ignore|sp_sizeof_paren\s*=\s*add|sp_sizeof_paren\s*=\s*remove|sp_sizeof_paren\s*=\s*force|sp_sizeof_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Sizeof Paren|Add Sp Sizeof Paren|Remove Sp Sizeof Paren|Force Sp Sizeof Paren"
 ValueDefault=ignore
 
@@ -1230,7 +1312,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|sp_sizeof_ellipsis=not_defined
+Choices=sp_sizeof_ellipsis\s*=\s*ignore|sp_sizeof_ellipsis\s*=\s*add|sp_sizeof_ellipsis\s*=\s*remove|sp_sizeof_ellipsis\s*=\s*force|sp_sizeof_ellipsis\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Sizeof Ellipsis|Add Sp Sizeof Ellipsis|Remove Sp Sizeof Ellipsis|Force Sp Sizeof Ellipsis"
 ValueDefault=ignore
 
@@ -1239,7 +1321,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|sp_sizeof_ellipsis_paren=not_defined
+Choices=sp_sizeof_ellipsis_paren\s*=\s*ignore|sp_sizeof_ellipsis_paren\s*=\s*add|sp_sizeof_ellipsis_paren\s*=\s*remove|sp_sizeof_ellipsis_paren\s*=\s*force|sp_sizeof_ellipsis_paren\s*=\s*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
 
@@ -1248,7 +1330,7 @@ Category=1
 Description="<html>Add or remove space between '...' and a parameter pack.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_ellipsis_parameter_pack=ignore|sp_ellipsis_parameter_pack=add|sp_ellipsis_parameter_pack=remove|sp_ellipsis_parameter_pack=force|sp_ellipsis_parameter_pack=not_defined
+Choices=sp_ellipsis_parameter_pack\s*=\s*ignore|sp_ellipsis_parameter_pack\s*=\s*add|sp_ellipsis_parameter_pack\s*=\s*remove|sp_ellipsis_parameter_pack\s*=\s*force|sp_ellipsis_parameter_pack\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Ellipsis Parameter Pack|Add Sp Ellipsis Parameter Pack|Remove Sp Ellipsis Parameter Pack|Force Sp Ellipsis Parameter Pack"
 ValueDefault=ignore
 
@@ -1257,7 +1339,7 @@ Category=1
 Description="<html>Add or remove space between a parameter pack and '...'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_parameter_pack_ellipsis=ignore|sp_parameter_pack_ellipsis=add|sp_parameter_pack_ellipsis=remove|sp_parameter_pack_ellipsis=force|sp_parameter_pack_ellipsis=not_defined
+Choices=sp_parameter_pack_ellipsis\s*=\s*ignore|sp_parameter_pack_ellipsis\s*=\s*add|sp_parameter_pack_ellipsis\s*=\s*remove|sp_parameter_pack_ellipsis\s*=\s*force|sp_parameter_pack_ellipsis\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Parameter Pack Ellipsis|Add Sp Parameter Pack Ellipsis|Remove Sp Parameter Pack Ellipsis|Force Sp Parameter Pack Ellipsis"
 ValueDefault=ignore
 
@@ -1266,7 +1348,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|sp_decltype_paren=not_defined
+Choices=sp_decltype_paren\s*=\s*ignore|sp_decltype_paren\s*=\s*add|sp_decltype_paren\s*=\s*remove|sp_decltype_paren\s*=\s*force|sp_decltype_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Decltype Paren|Add Sp Decltype Paren|Remove Sp Decltype Paren|Force Sp Decltype Paren"
 ValueDefault=ignore
 
@@ -1275,7 +1357,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|sp_after_tag=not_defined
+Choices=sp_after_tag\s*=\s*ignore|sp_after_tag\s*=\s*add|sp_after_tag\s*=\s*remove|sp_after_tag\s*=\s*force|sp_after_tag\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Tag|Add Sp After Tag|Remove Sp After Tag|Force Sp After Tag"
 ValueDefault=ignore
 
@@ -1284,7 +1366,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|sp_inside_braces_enum=not_defined
+Choices=sp_inside_braces_enum\s*=\s*ignore|sp_inside_braces_enum\s*=\s*add|sp_inside_braces_enum\s*=\s*remove|sp_inside_braces_enum\s*=\s*force|sp_inside_braces_enum\s*=\s*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
 
@@ -1293,7 +1375,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|sp_inside_braces_struct=not_defined
+Choices=sp_inside_braces_struct\s*=\s*ignore|sp_inside_braces_struct\s*=\s*add|sp_inside_braces_struct\s*=\s*remove|sp_inside_braces_struct\s*=\s*force|sp_inside_braces_struct\s*=\s*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
 
@@ -1302,7 +1384,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|sp_inside_braces_oc_dict=not_defined
+Choices=sp_inside_braces_oc_dict\s*=\s*ignore|sp_inside_braces_oc_dict\s*=\s*add|sp_inside_braces_oc_dict\s*=\s*remove|sp_inside_braces_oc_dict\s*=\s*force|sp_inside_braces_oc_dict\s*=\s*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
 
@@ -1311,7 +1393,7 @@ Category=1
 Description="<html>Add or remove space after open brace in an unnamed temporary<br/>direct-list-initialization<br/>if statement is a brace_init_lst<br/>works only if sp_brace_brace is set to ignore.</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
+Choices=sp_after_type_brace_init_lst_open\s*=\s*ignore|sp_after_type_brace_init_lst_open\s*=\s*add|sp_after_type_brace_init_lst_open\s*=\s*remove|sp_after_type_brace_init_lst_open\s*=\s*force|sp_after_type_brace_init_lst_open\s*=\s*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
 
@@ -1320,7 +1402,7 @@ Category=1
 Description="<html>Add or remove space before close brace in an unnamed temporary<br/>direct-list-initialization<br/>if statement is a brace_init_lst<br/>works only if sp_brace_brace is set to ignore.</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
+Choices=sp_before_type_brace_init_lst_close\s*=\s*ignore|sp_before_type_brace_init_lst_close\s*=\s*add|sp_before_type_brace_init_lst_close\s*=\s*remove|sp_before_type_brace_init_lst_close\s*=\s*force|sp_before_type_brace_init_lst_close\s*=\s*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
 
@@ -1329,7 +1411,7 @@ Category=1
 Description="<html>Add or remove space inside an unnamed temporary direct-list-initialization<br/>if statement is a brace_init_lst<br/>works only if sp_brace_brace is set to ignore<br/>works only if sp_before_type_brace_init_lst_close is set to ignore.</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
+Choices=sp_inside_type_brace_init_lst\s*=\s*ignore|sp_inside_type_brace_init_lst\s*=\s*add|sp_inside_type_brace_init_lst\s*=\s*remove|sp_inside_type_brace_init_lst\s*=\s*force|sp_inside_type_brace_init_lst\s*=\s*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
 
@@ -1338,16 +1420,16 @@ 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
+Choices=sp_inside_braces\s*=\s*ignore|sp_inside_braces\s*=\s*add|sp_inside_braces\s*=\s*remove|sp_inside_braces\s*=\s*force|sp_inside_braces\s*=\s*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>"
+Description="<html>Add or remove space inside '{}'.<br/>if empty.</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
+Choices=sp_inside_braces_empty\s*=\s*ignore|sp_inside_braces_empty\s*=\s*add|sp_inside_braces_empty\s*=\s*remove|sp_inside_braces_empty\s*=\s*force|sp_inside_braces_empty\s*=\s*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
 
@@ -1356,7 +1438,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|sp_trailing_return=not_defined
+Choices=sp_trailing_return\s*=\s*ignore|sp_trailing_return\s*=\s*add|sp_trailing_return\s*=\s*remove|sp_trailing_return\s*=\s*force|sp_trailing_return\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Trailing Return|Add Sp Trailing Return|Remove Sp Trailing Return|Force Sp Trailing Return"
 ValueDefault=ignore
 
@@ -1365,7 +1447,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|sp_type_func=not_defined
+Choices=sp_type_func\s*=\s*ignore|sp_type_func\s*=\s*add|sp_type_func\s*=\s*remove|sp_type_func\s*=\s*force|sp_type_func\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Type Func|Add Sp Type Func|Remove Sp Type Func|Force Sp Type Func"
 ValueDefault=ignore
 
@@ -1374,7 +1456,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|sp_type_brace_init_lst=not_defined
+Choices=sp_type_brace_init_lst\s*=\s*ignore|sp_type_brace_init_lst\s*=\s*add|sp_type_brace_init_lst\s*=\s*remove|sp_type_brace_init_lst\s*=\s*force|sp_type_brace_init_lst\s*=\s*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
 
@@ -1383,16 +1465,16 @@ 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
+Choices=sp_func_proto_paren\s*=\s*ignore|sp_func_proto_paren\s*=\s*add|sp_func_proto_paren\s*=\s*remove|sp_func_proto_paren\s*=\s*force|sp_func_proto_paren\s*=\s*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>"
+Description="<html>Add or remove space between function name and '()' on function declaration<br/>if empty.</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
+Choices=sp_func_proto_paren_empty\s*=\s*ignore|sp_func_proto_paren_empty\s*=\s*add|sp_func_proto_paren_empty\s*=\s*remove|sp_func_proto_paren_empty\s*=\s*force|sp_func_proto_paren_empty\s*=\s*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
 
@@ -1401,7 +1483,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|sp_func_type_paren=not_defined
+Choices=sp_func_type_paren\s*=\s*ignore|sp_func_type_paren\s*=\s*add|sp_func_type_paren\s*=\s*remove|sp_func_type_paren\s*=\s*force|sp_func_type_paren\s*=\s*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
 
@@ -1410,16 +1492,16 @@ 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
+Choices=sp_func_def_paren\s*=\s*ignore|sp_func_def_paren\s*=\s*add|sp_func_def_paren\s*=\s*remove|sp_func_def_paren\s*=\s*force|sp_func_def_paren\s*=\s*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>"
+Description="<html>Add or remove space between function name and '()' on function definition<br/>if empty.</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
+Choices=sp_func_def_paren_empty\s*=\s*ignore|sp_func_def_paren_empty\s*=\s*add|sp_func_def_paren_empty\s*=\s*remove|sp_func_def_paren_empty\s*=\s*force|sp_func_def_paren_empty\s*=\s*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
 
@@ -1428,7 +1510,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|sp_inside_fparens=not_defined
+Choices=sp_inside_fparens\s*=\s*ignore|sp_inside_fparens\s*=\s*add|sp_inside_fparens\s*=\s*remove|sp_inside_fparens\s*=\s*force|sp_inside_fparens\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Inside Fparens|Add Sp Inside Fparens|Remove Sp Inside Fparens|Force Sp Inside Fparens"
 ValueDefault=ignore
 
@@ -1437,16 +1519,43 @@ 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
+Choices=sp_inside_fparen\s*=\s*ignore|sp_inside_fparen\s*=\s*add|sp_inside_fparen\s*=\s*remove|sp_inside_fparen\s*=\s*force|sp_inside_fparen\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Inside Fparen|Add Sp Inside Fparen|Remove Sp Inside Fparen|Force Sp Inside Fparen"
 ValueDefault=ignore
 
+[Sp Func Call User Inside Rparen]
+Category=1
+Description="<html>Add or remove space inside user functor '(' and ')'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_func_call_user_inside_rparen\s*=\s*ignore|sp_func_call_user_inside_rparen\s*=\s*add|sp_func_call_user_inside_rparen\s*=\s*remove|sp_func_call_user_inside_rparen\s*=\s*force|sp_func_call_user_inside_rparen\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Func Call User Inside Rparen|Add Sp Func Call User Inside Rparen|Remove Sp Func Call User Inside Rparen|Force Sp Func Call User Inside Rparen"
+ValueDefault=ignore
+
+[Sp Inside Rparens]
+Category=1
+Description="<html>Add or remove space inside empty functor '()'.<br/>Overrides sp_after_angle unless use_sp_after_angle_always is set to true.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_inside_rparens\s*=\s*ignore|sp_inside_rparens\s*=\s*add|sp_inside_rparens\s*=\s*remove|sp_inside_rparens\s*=\s*force|sp_inside_rparens\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Inside Rparens|Add Sp Inside Rparens|Remove Sp Inside Rparens|Force Sp Inside Rparens"
+ValueDefault=ignore
+
+[Sp Inside Rparen]
+Category=1
+Description="<html>Add or remove space inside functor '(' and ')'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_inside_rparen\s*=\s*ignore|sp_inside_rparen\s*=\s*add|sp_inside_rparen\s*=\s*remove|sp_inside_rparen\s*=\s*force|sp_inside_rparen\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Inside Rparen|Add Sp Inside Rparen|Remove Sp Inside Rparen|Force Sp Inside Rparen"
+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
+Choices=sp_inside_tparen\s*=\s*ignore|sp_inside_tparen\s*=\s*add|sp_inside_tparen\s*=\s*remove|sp_inside_tparen\s*=\s*force|sp_inside_tparen\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Inside Tparen|Add Sp Inside Tparen|Remove Sp Inside Tparen|Force Sp Inside Tparen"
 ValueDefault=ignore
 
@@ -1455,7 +1564,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|sp_after_tparen_close=not_defined
+Choices=sp_after_tparen_close\s*=\s*ignore|sp_after_tparen_close\s*=\s*add|sp_after_tparen_close\s*=\s*remove|sp_after_tparen_close\s*=\s*force|sp_after_tparen_close\s*=\s*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
 
@@ -1464,7 +1573,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|sp_square_fparen=not_defined
+Choices=sp_square_fparen\s*=\s*ignore|sp_square_fparen\s*=\s*add|sp_square_fparen\s*=\s*remove|sp_square_fparen\s*=\s*force|sp_square_fparen\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Square Fparen|Add Sp Square Fparen|Remove Sp Square Fparen|Force Sp Square Fparen"
 ValueDefault=ignore
 
@@ -1473,7 +1582,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|sp_fparen_brace=not_defined
+Choices=sp_fparen_brace\s*=\s*ignore|sp_fparen_brace\s*=\s*add|sp_fparen_brace\s*=\s*remove|sp_fparen_brace\s*=\s*force|sp_fparen_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Fparen Brace|Add Sp Fparen Brace|Remove Sp Fparen Brace|Force Sp Fparen Brace"
 ValueDefault=ignore
 
@@ -1482,7 +1591,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|sp_fparen_brace_initializer=not_defined
+Choices=sp_fparen_brace_initializer\s*=\s*ignore|sp_fparen_brace_initializer\s*=\s*add|sp_fparen_brace_initializer\s*=\s*remove|sp_fparen_brace_initializer\s*=\s*force|sp_fparen_brace_initializer\s*=\s*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
 
@@ -1491,7 +1600,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|sp_fparen_dbrace=not_defined
+Choices=sp_fparen_dbrace\s*=\s*ignore|sp_fparen_dbrace\s*=\s*add|sp_fparen_dbrace\s*=\s*remove|sp_fparen_dbrace\s*=\s*force|sp_fparen_dbrace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Fparen Dbrace|Add Sp Fparen Dbrace|Remove Sp Fparen Dbrace|Force Sp Fparen Dbrace"
 ValueDefault=ignore
 
@@ -1500,7 +1609,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|sp_func_call_paren=not_defined
+Choices=sp_func_call_paren\s*=\s*ignore|sp_func_call_paren\s*=\s*add|sp_func_call_paren\s*=\s*remove|sp_func_call_paren\s*=\s*force|sp_func_call_paren\s*=\s*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
 
@@ -1509,7 +1618,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|sp_func_call_paren_empty=not_defined
+Choices=sp_func_call_paren_empty\s*=\s*ignore|sp_func_call_paren_empty\s*=\s*add|sp_func_call_paren_empty\s*=\s*remove|sp_func_call_paren_empty\s*=\s*force|sp_func_call_paren_empty\s*=\s*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
 
@@ -1518,7 +1627,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|sp_func_call_user_paren=not_defined
+Choices=sp_func_call_user_paren\s*=\s*ignore|sp_func_call_user_paren\s*=\s*add|sp_func_call_user_paren\s*=\s*remove|sp_func_call_user_paren\s*=\s*force|sp_func_call_user_paren\s*=\s*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
 
@@ -1527,7 +1636,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|sp_func_call_user_inside_fparen=not_defined
+Choices=sp_func_call_user_inside_fparen\s*=\s*ignore|sp_func_call_user_inside_fparen\s*=\s*add|sp_func_call_user_inside_fparen\s*=\s*remove|sp_func_call_user_inside_fparen\s*=\s*force|sp_func_call_user_inside_fparen\s*=\s*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
 
@@ -1536,7 +1645,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|sp_func_call_user_paren_paren=not_defined
+Choices=sp_func_call_user_paren_paren\s*=\s*ignore|sp_func_call_user_paren_paren\s*=\s*add|sp_func_call_user_paren_paren\s*=\s*remove|sp_func_call_user_paren_paren\s*=\s*force|sp_func_call_user_paren_paren\s*=\s*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
 
@@ -1545,7 +1654,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|sp_func_class_paren=not_defined
+Choices=sp_func_class_paren\s*=\s*ignore|sp_func_class_paren\s*=\s*add|sp_func_class_paren\s*=\s*remove|sp_func_class_paren\s*=\s*force|sp_func_class_paren\s*=\s*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
 
@@ -1554,7 +1663,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|sp_func_class_paren_empty=not_defined
+Choices=sp_func_class_paren_empty\s*=\s*ignore|sp_func_class_paren_empty\s*=\s*add|sp_func_class_paren_empty\s*=\s*remove|sp_func_class_paren_empty\s*=\s*force|sp_func_class_paren_empty\s*=\s*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
 
@@ -1563,7 +1672,7 @@ Category=1
 Description="<html>Add or remove space after 'return'.<br/><br/>Default: force</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_return=ignore|sp_return=add|sp_return=remove|sp_return=force|sp_return=not_defined
+Choices=sp_return\s*=\s*ignore|sp_return\s*=\s*add|sp_return\s*=\s*remove|sp_return\s*=\s*force|sp_return\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Return|Add Sp Return|Remove Sp Return|Force Sp Return"
 ValueDefault=force
 
@@ -1572,7 +1681,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|sp_return_paren=not_defined
+Choices=sp_return_paren\s*=\s*ignore|sp_return_paren\s*=\s*add|sp_return_paren\s*=\s*remove|sp_return_paren\s*=\s*force|sp_return_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Return Paren|Add Sp Return Paren|Remove Sp Return Paren|Force Sp Return Paren"
 ValueDefault=ignore
 
@@ -1581,7 +1690,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|sp_return_brace=not_defined
+Choices=sp_return_brace\s*=\s*ignore|sp_return_brace\s*=\s*add|sp_return_brace\s*=\s*remove|sp_return_brace\s*=\s*force|sp_return_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Return Brace|Add Sp Return Brace|Remove Sp Return Brace|Force Sp Return Brace"
 ValueDefault=ignore
 
@@ -1590,7 +1699,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|sp_attribute_paren=not_defined
+Choices=sp_attribute_paren\s*=\s*ignore|sp_attribute_paren\s*=\s*add|sp_attribute_paren\s*=\s*remove|sp_attribute_paren\s*=\s*force|sp_attribute_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Attribute Paren|Add Sp Attribute Paren|Remove Sp Attribute Paren|Force Sp Attribute Paren"
 ValueDefault=ignore
 
@@ -1599,7 +1708,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|sp_defined_paren=not_defined
+Choices=sp_defined_paren\s*=\s*ignore|sp_defined_paren\s*=\s*add|sp_defined_paren\s*=\s*remove|sp_defined_paren\s*=\s*force|sp_defined_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Defined Paren|Add Sp Defined Paren|Remove Sp Defined Paren|Force Sp Defined Paren"
 ValueDefault=ignore
 
@@ -1608,7 +1717,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|sp_throw_paren=not_defined
+Choices=sp_throw_paren\s*=\s*ignore|sp_throw_paren\s*=\s*add|sp_throw_paren\s*=\s*remove|sp_throw_paren\s*=\s*force|sp_throw_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Throw Paren|Add Sp Throw Paren|Remove Sp Throw Paren|Force Sp Throw Paren"
 ValueDefault=ignore
 
@@ -1617,7 +1726,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|sp_after_throw=not_defined
+Choices=sp_after_throw\s*=\s*ignore|sp_after_throw\s*=\s*add|sp_after_throw\s*=\s*remove|sp_after_throw\s*=\s*force|sp_after_throw\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Throw|Add Sp After Throw|Remove Sp After Throw|Force Sp After Throw"
 ValueDefault=ignore
 
@@ -1626,7 +1735,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|sp_catch_paren=not_defined
+Choices=sp_catch_paren\s*=\s*ignore|sp_catch_paren\s*=\s*add|sp_catch_paren\s*=\s*remove|sp_catch_paren\s*=\s*force|sp_catch_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Catch Paren|Add Sp Catch Paren|Remove Sp Catch Paren|Force Sp Catch Paren"
 ValueDefault=ignore
 
@@ -1635,7 +1744,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|sp_oc_catch_paren=not_defined
+Choices=sp_oc_catch_paren\s*=\s*ignore|sp_oc_catch_paren\s*=\s*add|sp_oc_catch_paren\s*=\s*remove|sp_oc_catch_paren\s*=\s*force|sp_oc_catch_paren\s*=\s*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
 
@@ -1644,7 +1753,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|sp_before_oc_proto_list=not_defined
+Choices=sp_before_oc_proto_list\s*=\s*ignore|sp_before_oc_proto_list\s*=\s*add|sp_before_oc_proto_list\s*=\s*remove|sp_before_oc_proto_list\s*=\s*force|sp_before_oc_proto_list\s*=\s*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
 
@@ -1653,7 +1762,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|sp_oc_classname_paren=not_defined
+Choices=sp_oc_classname_paren\s*=\s*ignore|sp_oc_classname_paren\s*=\s*add|sp_oc_classname_paren\s*=\s*remove|sp_oc_classname_paren\s*=\s*force|sp_oc_classname_paren\s*=\s*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
 
@@ -1662,7 +1771,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|sp_version_paren=not_defined
+Choices=sp_version_paren\s*=\s*ignore|sp_version_paren\s*=\s*add|sp_version_paren\s*=\s*remove|sp_version_paren\s*=\s*force|sp_version_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Version Paren|Add Sp Version Paren|Remove Sp Version Paren|Force Sp Version Paren"
 ValueDefault=ignore
 
@@ -1671,7 +1780,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|sp_scope_paren=not_defined
+Choices=sp_scope_paren\s*=\s*ignore|sp_scope_paren\s*=\s*add|sp_scope_paren\s*=\s*remove|sp_scope_paren\s*=\s*force|sp_scope_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Scope Paren|Add Sp Scope Paren|Remove Sp Scope Paren|Force Sp Scope Paren"
 ValueDefault=ignore
 
@@ -1680,7 +1789,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|sp_super_paren=not_defined
+Choices=sp_super_paren\s*=\s*ignore|sp_super_paren\s*=\s*add|sp_super_paren\s*=\s*remove|sp_super_paren\s*=\s*force|sp_super_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Super Paren|Add Sp Super Paren|Remove Sp Super Paren|Force Sp Super Paren"
 ValueDefault=remove
 
@@ -1689,7 +1798,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|sp_this_paren=not_defined
+Choices=sp_this_paren\s*=\s*ignore|sp_this_paren\s*=\s*add|sp_this_paren\s*=\s*remove|sp_this_paren\s*=\s*force|sp_this_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp This Paren|Add Sp This Paren|Remove Sp This Paren|Force Sp This Paren"
 ValueDefault=remove
 
@@ -1698,7 +1807,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|sp_macro=not_defined
+Choices=sp_macro\s*=\s*ignore|sp_macro\s*=\s*add|sp_macro\s*=\s*remove|sp_macro\s*=\s*force|sp_macro\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Macro|Add Sp Macro|Remove Sp Macro|Force Sp Macro"
 ValueDefault=ignore
 
@@ -1707,7 +1816,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|sp_macro_func=not_defined
+Choices=sp_macro_func\s*=\s*ignore|sp_macro_func\s*=\s*add|sp_macro_func\s*=\s*remove|sp_macro_func\s*=\s*force|sp_macro_func\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Macro Func|Add Sp Macro Func|Remove Sp Macro Func|Force Sp Macro Func"
 ValueDefault=ignore
 
@@ -1716,7 +1825,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|sp_else_brace=not_defined
+Choices=sp_else_brace\s*=\s*ignore|sp_else_brace\s*=\s*add|sp_else_brace\s*=\s*remove|sp_else_brace\s*=\s*force|sp_else_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Else Brace|Add Sp Else Brace|Remove Sp Else Brace|Force Sp Else Brace"
 ValueDefault=ignore
 
@@ -1725,7 +1834,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|sp_brace_else=not_defined
+Choices=sp_brace_else\s*=\s*ignore|sp_brace_else\s*=\s*add|sp_brace_else\s*=\s*remove|sp_brace_else\s*=\s*force|sp_brace_else\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Brace Else|Add Sp Brace Else|Remove Sp Brace Else|Force Sp Brace Else"
 ValueDefault=ignore
 
@@ -1734,7 +1843,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|sp_brace_typedef=not_defined
+Choices=sp_brace_typedef\s*=\s*ignore|sp_brace_typedef\s*=\s*add|sp_brace_typedef\s*=\s*remove|sp_brace_typedef\s*=\s*force|sp_brace_typedef\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Brace Typedef|Add Sp Brace Typedef|Remove Sp Brace Typedef|Force Sp Brace Typedef"
 ValueDefault=ignore
 
@@ -1743,7 +1852,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|sp_catch_brace=not_defined
+Choices=sp_catch_brace\s*=\s*ignore|sp_catch_brace\s*=\s*add|sp_catch_brace\s*=\s*remove|sp_catch_brace\s*=\s*force|sp_catch_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Catch Brace|Add Sp Catch Brace|Remove Sp Catch Brace|Force Sp Catch Brace"
 ValueDefault=ignore
 
@@ -1752,7 +1861,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|sp_oc_catch_brace=not_defined
+Choices=sp_oc_catch_brace\s*=\s*ignore|sp_oc_catch_brace\s*=\s*add|sp_oc_catch_brace\s*=\s*remove|sp_oc_catch_brace\s*=\s*force|sp_oc_catch_brace\s*=\s*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
 
@@ -1761,7 +1870,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|sp_brace_catch=not_defined
+Choices=sp_brace_catch\s*=\s*ignore|sp_brace_catch\s*=\s*add|sp_brace_catch\s*=\s*remove|sp_brace_catch\s*=\s*force|sp_brace_catch\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Brace Catch|Add Sp Brace Catch|Remove Sp Brace Catch|Force Sp Brace Catch"
 ValueDefault=ignore
 
@@ -1770,7 +1879,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|sp_oc_brace_catch=not_defined
+Choices=sp_oc_brace_catch\s*=\s*ignore|sp_oc_brace_catch\s*=\s*add|sp_oc_brace_catch\s*=\s*remove|sp_oc_brace_catch\s*=\s*force|sp_oc_brace_catch\s*=\s*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
 
@@ -1779,7 +1888,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|sp_finally_brace=not_defined
+Choices=sp_finally_brace\s*=\s*ignore|sp_finally_brace\s*=\s*add|sp_finally_brace\s*=\s*remove|sp_finally_brace\s*=\s*force|sp_finally_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Finally Brace|Add Sp Finally Brace|Remove Sp Finally Brace|Force Sp Finally Brace"
 ValueDefault=ignore
 
@@ -1788,7 +1897,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|sp_brace_finally=not_defined
+Choices=sp_brace_finally\s*=\s*ignore|sp_brace_finally\s*=\s*add|sp_brace_finally\s*=\s*remove|sp_brace_finally\s*=\s*force|sp_brace_finally\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Brace Finally|Add Sp Brace Finally|Remove Sp Brace Finally|Force Sp Brace Finally"
 ValueDefault=ignore
 
@@ -1797,7 +1906,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|sp_try_brace=not_defined
+Choices=sp_try_brace\s*=\s*ignore|sp_try_brace\s*=\s*add|sp_try_brace\s*=\s*remove|sp_try_brace\s*=\s*force|sp_try_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Try Brace|Add Sp Try Brace|Remove Sp Try Brace|Force Sp Try Brace"
 ValueDefault=ignore
 
@@ -1806,7 +1915,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|sp_getset_brace=not_defined
+Choices=sp_getset_brace\s*=\s*ignore|sp_getset_brace\s*=\s*add|sp_getset_brace\s*=\s*remove|sp_getset_brace\s*=\s*force|sp_getset_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Getset Brace|Add Sp Getset Brace|Remove Sp Getset Brace|Force Sp Getset Brace"
 ValueDefault=ignore
 
@@ -1815,7 +1924,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|sp_word_brace_init_lst=not_defined
+Choices=sp_word_brace_init_lst\s*=\s*ignore|sp_word_brace_init_lst\s*=\s*add|sp_word_brace_init_lst\s*=\s*remove|sp_word_brace_init_lst\s*=\s*force|sp_word_brace_init_lst\s*=\s*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
 
@@ -1824,7 +1933,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|sp_word_brace_ns=not_defined
+Choices=sp_word_brace_ns\s*=\s*ignore|sp_word_brace_ns\s*=\s*add|sp_word_brace_ns\s*=\s*remove|sp_word_brace_ns\s*=\s*force|sp_word_brace_ns\s*=\s*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
 
@@ -1833,7 +1942,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|sp_before_dc=not_defined
+Choices=sp_before_dc\s*=\s*ignore|sp_before_dc\s*=\s*add|sp_before_dc\s*=\s*remove|sp_before_dc\s*=\s*force|sp_before_dc\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Dc|Add Sp Before Dc|Remove Sp Before Dc|Force Sp Before Dc"
 ValueDefault=ignore
 
@@ -1842,7 +1951,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|sp_after_dc=not_defined
+Choices=sp_after_dc\s*=\s*ignore|sp_after_dc\s*=\s*add|sp_after_dc\s*=\s*remove|sp_after_dc\s*=\s*force|sp_after_dc\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Dc|Add Sp After Dc|Remove Sp After Dc|Force Sp After Dc"
 ValueDefault=ignore
 
@@ -1851,7 +1960,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|sp_d_array_colon=not_defined
+Choices=sp_d_array_colon\s*=\s*ignore|sp_d_array_colon\s*=\s*add|sp_d_array_colon\s*=\s*remove|sp_d_array_colon\s*=\s*force|sp_d_array_colon\s*=\s*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
 
@@ -1860,7 +1969,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|sp_not=not_defined
+Choices=sp_not\s*=\s*ignore|sp_not\s*=\s*add|sp_not\s*=\s*remove|sp_not\s*=\s*force|sp_not\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Not|Add Sp Not|Remove Sp Not|Force Sp Not"
 ValueDefault=remove
 
@@ -1869,7 +1978,7 @@ Category=1
 Description="<html>Add or remove space between two '!' (not) unary operators.<br/>If set to ignore, sp_not will be used.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_not_not=ignore|sp_not_not=add|sp_not_not=remove|sp_not_not=force|sp_not_not=not_defined
+Choices=sp_not_not\s*=\s*ignore|sp_not_not\s*=\s*add|sp_not_not\s*=\s*remove|sp_not_not\s*=\s*force|sp_not_not\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Not Not|Add Sp Not Not|Remove Sp Not Not|Force Sp Not Not"
 ValueDefault=ignore
 
@@ -1878,7 +1987,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|sp_inv=not_defined
+Choices=sp_inv\s*=\s*ignore|sp_inv\s*=\s*add|sp_inv\s*=\s*remove|sp_inv\s*=\s*force|sp_inv\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Inv|Add Sp Inv|Remove Sp Inv|Force Sp Inv"
 ValueDefault=remove
 
@@ -1887,7 +1996,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|sp_addr=not_defined
+Choices=sp_addr\s*=\s*ignore|sp_addr\s*=\s*add|sp_addr\s*=\s*remove|sp_addr\s*=\s*force|sp_addr\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Addr|Add Sp Addr|Remove Sp Addr|Force Sp Addr"
 ValueDefault=remove
 
@@ -1896,7 +2005,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|sp_member=not_defined
+Choices=sp_member\s*=\s*ignore|sp_member\s*=\s*add|sp_member\s*=\s*remove|sp_member\s*=\s*force|sp_member\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Member|Add Sp Member|Remove Sp Member|Force Sp Member"
 ValueDefault=remove
 
@@ -1905,7 +2014,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|sp_deref=not_defined
+Choices=sp_deref\s*=\s*ignore|sp_deref\s*=\s*add|sp_deref\s*=\s*remove|sp_deref\s*=\s*force|sp_deref\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Deref|Add Sp Deref|Remove Sp Deref|Force Sp Deref"
 ValueDefault=remove
 
@@ -1914,7 +2023,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|sp_sign=not_defined
+Choices=sp_sign\s*=\s*ignore|sp_sign\s*=\s*add|sp_sign\s*=\s*remove|sp_sign\s*=\s*force|sp_sign\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Sign|Add Sp Sign|Remove Sp Sign|Force Sp Sign"
 ValueDefault=remove
 
@@ -1923,7 +2032,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|sp_incdec=not_defined
+Choices=sp_incdec\s*=\s*ignore|sp_incdec\s*=\s*add|sp_incdec\s*=\s*remove|sp_incdec\s*=\s*force|sp_incdec\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Incdec|Add Sp Incdec|Remove Sp Incdec|Force Sp Incdec"
 ValueDefault=remove
 
@@ -1932,7 +2041,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|sp_before_nl_cont=not_defined
+Choices=sp_before_nl_cont\s*=\s*ignore|sp_before_nl_cont\s*=\s*add|sp_before_nl_cont\s*=\s*remove|sp_before_nl_cont\s*=\s*force|sp_before_nl_cont\s*=\s*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
 
@@ -1941,7 +2050,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|sp_after_oc_scope=not_defined
+Choices=sp_after_oc_scope\s*=\s*ignore|sp_after_oc_scope\s*=\s*add|sp_after_oc_scope\s*=\s*remove|sp_after_oc_scope\s*=\s*force|sp_after_oc_scope\s*=\s*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
 
@@ -1950,7 +2059,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|sp_after_oc_colon=not_defined
+Choices=sp_after_oc_colon\s*=\s*ignore|sp_after_oc_colon\s*=\s*add|sp_after_oc_colon\s*=\s*remove|sp_after_oc_colon\s*=\s*force|sp_after_oc_colon\s*=\s*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
 
@@ -1959,7 +2068,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|sp_before_oc_colon=not_defined
+Choices=sp_before_oc_colon\s*=\s*ignore|sp_before_oc_colon\s*=\s*add|sp_before_oc_colon\s*=\s*remove|sp_before_oc_colon\s*=\s*force|sp_before_oc_colon\s*=\s*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
 
@@ -1968,7 +2077,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|sp_after_oc_dict_colon=not_defined
+Choices=sp_after_oc_dict_colon\s*=\s*ignore|sp_after_oc_dict_colon\s*=\s*add|sp_after_oc_dict_colon\s*=\s*remove|sp_after_oc_dict_colon\s*=\s*force|sp_after_oc_dict_colon\s*=\s*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
 
@@ -1977,7 +2086,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|sp_before_oc_dict_colon=not_defined
+Choices=sp_before_oc_dict_colon\s*=\s*ignore|sp_before_oc_dict_colon\s*=\s*add|sp_before_oc_dict_colon\s*=\s*remove|sp_before_oc_dict_colon\s*=\s*force|sp_before_oc_dict_colon\s*=\s*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
 
@@ -1986,7 +2095,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|sp_after_send_oc_colon=not_defined
+Choices=sp_after_send_oc_colon\s*=\s*ignore|sp_after_send_oc_colon\s*=\s*add|sp_after_send_oc_colon\s*=\s*remove|sp_after_send_oc_colon\s*=\s*force|sp_after_send_oc_colon\s*=\s*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
 
@@ -1995,7 +2104,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|sp_before_send_oc_colon=not_defined
+Choices=sp_before_send_oc_colon\s*=\s*ignore|sp_before_send_oc_colon\s*=\s*add|sp_before_send_oc_colon\s*=\s*remove|sp_before_send_oc_colon\s*=\s*force|sp_before_send_oc_colon\s*=\s*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
 
@@ -2004,7 +2113,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|sp_after_oc_type=not_defined
+Choices=sp_after_oc_type\s*=\s*ignore|sp_after_oc_type\s*=\s*add|sp_after_oc_type\s*=\s*remove|sp_after_oc_type\s*=\s*force|sp_after_oc_type\s*=\s*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
 
@@ -2013,7 +2122,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|sp_after_oc_return_type=not_defined
+Choices=sp_after_oc_return_type\s*=\s*ignore|sp_after_oc_return_type\s*=\s*add|sp_after_oc_return_type\s*=\s*remove|sp_after_oc_return_type\s*=\s*force|sp_after_oc_return_type\s*=\s*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
 
@@ -2022,7 +2131,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|sp_after_oc_at_sel=not_defined
+Choices=sp_after_oc_at_sel\s*=\s*ignore|sp_after_oc_at_sel\s*=\s*add|sp_after_oc_at_sel\s*=\s*remove|sp_after_oc_at_sel\s*=\s*force|sp_after_oc_at_sel\s*=\s*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
 
@@ -2031,7 +2140,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|sp_after_oc_at_sel_parens=not_defined
+Choices=sp_after_oc_at_sel_parens\s*=\s*ignore|sp_after_oc_at_sel_parens\s*=\s*add|sp_after_oc_at_sel_parens\s*=\s*remove|sp_after_oc_at_sel_parens\s*=\s*force|sp_after_oc_at_sel_parens\s*=\s*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
 
@@ -2040,7 +2149,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|sp_inside_oc_at_sel_parens=not_defined
+Choices=sp_inside_oc_at_sel_parens\s*=\s*ignore|sp_inside_oc_at_sel_parens\s*=\s*add|sp_inside_oc_at_sel_parens\s*=\s*remove|sp_inside_oc_at_sel_parens\s*=\s*force|sp_inside_oc_at_sel_parens\s*=\s*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
 
@@ -2049,7 +2158,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|sp_before_oc_block_caret=not_defined
+Choices=sp_before_oc_block_caret\s*=\s*ignore|sp_before_oc_block_caret\s*=\s*add|sp_before_oc_block_caret\s*=\s*remove|sp_before_oc_block_caret\s*=\s*force|sp_before_oc_block_caret\s*=\s*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
 
@@ -2058,7 +2167,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|sp_after_oc_block_caret=not_defined
+Choices=sp_after_oc_block_caret\s*=\s*ignore|sp_after_oc_block_caret\s*=\s*add|sp_after_oc_block_caret\s*=\s*remove|sp_after_oc_block_caret\s*=\s*force|sp_after_oc_block_caret\s*=\s*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
 
@@ -2067,7 +2176,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|sp_after_oc_msg_receiver=not_defined
+Choices=sp_after_oc_msg_receiver\s*=\s*ignore|sp_after_oc_msg_receiver\s*=\s*add|sp_after_oc_msg_receiver\s*=\s*remove|sp_after_oc_msg_receiver\s*=\s*force|sp_after_oc_msg_receiver\s*=\s*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
 
@@ -2076,7 +2185,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|sp_after_oc_property=not_defined
+Choices=sp_after_oc_property\s*=\s*ignore|sp_after_oc_property\s*=\s*add|sp_after_oc_property\s*=\s*remove|sp_after_oc_property\s*=\s*force|sp_after_oc_property\s*=\s*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
 
@@ -2085,7 +2194,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|sp_after_oc_synchronized=not_defined
+Choices=sp_after_oc_synchronized\s*=\s*ignore|sp_after_oc_synchronized\s*=\s*add|sp_after_oc_synchronized\s*=\s*remove|sp_after_oc_synchronized\s*=\s*force|sp_after_oc_synchronized\s*=\s*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
 
@@ -2094,7 +2203,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|sp_cond_colon=not_defined
+Choices=sp_cond_colon\s*=\s*ignore|sp_cond_colon\s*=\s*add|sp_cond_colon\s*=\s*remove|sp_cond_colon\s*=\s*force|sp_cond_colon\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Cond Colon|Add Sp Cond Colon|Remove Sp Cond Colon|Force Sp Cond Colon"
 ValueDefault=ignore
 
@@ -2103,7 +2212,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|sp_cond_colon_before=not_defined
+Choices=sp_cond_colon_before\s*=\s*ignore|sp_cond_colon_before\s*=\s*add|sp_cond_colon_before\s*=\s*remove|sp_cond_colon_before\s*=\s*force|sp_cond_colon_before\s*=\s*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
 
@@ -2112,7 +2221,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|sp_cond_colon_after=not_defined
+Choices=sp_cond_colon_after\s*=\s*ignore|sp_cond_colon_after\s*=\s*add|sp_cond_colon_after\s*=\s*remove|sp_cond_colon_after\s*=\s*force|sp_cond_colon_after\s*=\s*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
 
@@ -2121,7 +2230,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|sp_cond_question=not_defined
+Choices=sp_cond_question\s*=\s*ignore|sp_cond_question\s*=\s*add|sp_cond_question\s*=\s*remove|sp_cond_question\s*=\s*force|sp_cond_question\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Cond Question|Add Sp Cond Question|Remove Sp Cond Question|Force Sp Cond Question"
 ValueDefault=ignore
 
@@ -2130,7 +2239,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|sp_cond_question_before=not_defined
+Choices=sp_cond_question_before\s*=\s*ignore|sp_cond_question_before\s*=\s*add|sp_cond_question_before\s*=\s*remove|sp_cond_question_before\s*=\s*force|sp_cond_question_before\s*=\s*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
 
@@ -2139,7 +2248,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|sp_cond_question_after=not_defined
+Choices=sp_cond_question_after\s*=\s*ignore|sp_cond_question_after\s*=\s*add|sp_cond_question_after\s*=\s*remove|sp_cond_question_after\s*=\s*force|sp_cond_question_after\s*=\s*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
 
@@ -2148,7 +2257,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|sp_cond_ternary_short=not_defined
+Choices=sp_cond_ternary_short\s*=\s*ignore|sp_cond_ternary_short\s*=\s*add|sp_cond_ternary_short\s*=\s*remove|sp_cond_ternary_short\s*=\s*force|sp_cond_ternary_short\s*=\s*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
 
@@ -2157,7 +2266,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|sp_case_label=not_defined
+Choices=sp_case_label\s*=\s*ignore|sp_case_label\s*=\s*add|sp_case_label\s*=\s*remove|sp_case_label\s*=\s*force|sp_case_label\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Case Label|Add Sp Case Label|Remove Sp Case Label|Force Sp Case Label"
 ValueDefault=ignore
 
@@ -2166,7 +2275,7 @@ 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
+Choices=sp_range\s*=\s*ignore|sp_range\s*=\s*add|sp_range\s*=\s*remove|sp_range\s*=\s*force|sp_range\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Range|Add Sp Range|Remove Sp Range|Force Sp Range"
 ValueDefault=ignore
 
@@ -2175,7 +2284,7 @@ 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
+Choices=sp_after_for_colon\s*=\s*ignore|sp_after_for_colon\s*=\s*add|sp_after_for_colon\s*=\s*remove|sp_after_for_colon\s*=\s*force|sp_after_for_colon\s*=\s*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
 
@@ -2184,7 +2293,7 @@ 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
+Choices=sp_before_for_colon\s*=\s*ignore|sp_before_for_colon\s*=\s*add|sp_before_for_colon\s*=\s*remove|sp_before_for_colon\s*=\s*force|sp_before_for_colon\s*=\s*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
 
@@ -2193,7 +2302,7 @@ 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
+Choices=sp_extern_paren\s*=\s*ignore|sp_extern_paren\s*=\s*add|sp_extern_paren\s*=\s*remove|sp_extern_paren\s*=\s*force|sp_extern_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Extern Paren|Add Sp Extern Paren|Remove Sp Extern Paren|Force Sp Extern Paren"
 ValueDefault=ignore
 
@@ -2202,16 +2311,32 @@ 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
+Choices=sp_cmt_cpp_start\s*=\s*ignore|sp_cmt_cpp_start\s*=\s*add|sp_cmt_cpp_start\s*=\s*remove|sp_cmt_cpp_start\s*=\s*force|sp_cmt_cpp_start\s*=\s*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 Pvs]
+Category=1
+Description="<html>remove space after the '//' and the pvs command '-V1234',<br/>only works with sp_cmt_cpp_start set to add or force.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=sp_cmt_cpp_pvs\s*=\s*true|sp_cmt_cpp_pvs\s*=\s*false
+ValueDefault=false
+
+[Sp Cmt Cpp Lint]
+Category=1
+Description="<html>remove space after the '//' and the command 'lint',<br/>only works with sp_cmt_cpp_start set to add or force.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=sp_cmt_cpp_lint\s*=\s*true|sp_cmt_cpp_lint\s*=\s*false
+ValueDefault=false
+
 [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
+Choices=sp_cmt_cpp_region\s*=\s*ignore|sp_cmt_cpp_region\s*=\s*add|sp_cmt_cpp_region\s*=\s*remove|sp_cmt_cpp_region\s*=\s*force|sp_cmt_cpp_region\s*=\s*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
 
@@ -2220,7 +2345,7 @@ 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
+TrueFalse=sp_cmt_cpp_doxygen\s*=\s*true|sp_cmt_cpp_doxygen\s*=\s*false
 ValueDefault=false
 
 [Sp Cmt Cpp Qttr]
@@ -2228,7 +2353,7 @@ 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
+TrueFalse=sp_cmt_cpp_qttr\s*=\s*true|sp_cmt_cpp_qttr\s*=\s*false
 ValueDefault=false
 
 [Sp Endif Cmt]
@@ -2236,7 +2361,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|sp_endif_cmt=not_defined
+Choices=sp_endif_cmt\s*=\s*ignore|sp_endif_cmt\s*=\s*add|sp_endif_cmt\s*=\s*remove|sp_endif_cmt\s*=\s*force|sp_endif_cmt\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Endif Cmt|Add Sp Endif Cmt|Remove Sp Endif Cmt|Force Sp Endif Cmt"
 ValueDefault=ignore
 
@@ -2245,7 +2370,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|sp_after_new=not_defined
+Choices=sp_after_new\s*=\s*ignore|sp_after_new\s*=\s*add|sp_after_new\s*=\s*remove|sp_after_new\s*=\s*force|sp_after_new\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After New|Add Sp After New|Remove Sp After New|Force Sp After New"
 ValueDefault=ignore
 
@@ -2254,7 +2379,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|sp_between_new_paren=not_defined
+Choices=sp_between_new_paren\s*=\s*ignore|sp_between_new_paren\s*=\s*add|sp_between_new_paren\s*=\s*remove|sp_between_new_paren\s*=\s*force|sp_between_new_paren\s*=\s*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
 
@@ -2263,7 +2388,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|sp_after_newop_paren=not_defined
+Choices=sp_after_newop_paren\s*=\s*ignore|sp_after_newop_paren\s*=\s*add|sp_after_newop_paren\s*=\s*remove|sp_after_newop_paren\s*=\s*force|sp_after_newop_paren\s*=\s*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
 
@@ -2272,7 +2397,7 @@ Category=1
 Description="<html>Add or remove space inside parentheses 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
+Choices=sp_inside_newop_paren\s*=\s*ignore|sp_inside_newop_paren\s*=\s*add|sp_inside_newop_paren\s*=\s*remove|sp_inside_newop_paren\s*=\s*force|sp_inside_newop_paren\s*=\s*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
 
@@ -2281,7 +2406,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|sp_inside_newop_paren_open=not_defined
+Choices=sp_inside_newop_paren_open\s*=\s*ignore|sp_inside_newop_paren_open\s*=\s*add|sp_inside_newop_paren_open\s*=\s*remove|sp_inside_newop_paren_open\s*=\s*force|sp_inside_newop_paren_open\s*=\s*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
 
@@ -2290,7 +2415,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|sp_inside_newop_paren_close=not_defined
+Choices=sp_inside_newop_paren_close\s*=\s*ignore|sp_inside_newop_paren_close\s*=\s*add|sp_inside_newop_paren_close\s*=\s*remove|sp_inside_newop_paren_close\s*=\s*force|sp_inside_newop_paren_close\s*=\s*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
 
@@ -2299,7 +2424,7 @@ Category=1
 Description="<html>Add or remove space before a trailing comment.</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_tr_cmt=ignore|sp_before_tr_cmt=add|sp_before_tr_cmt=remove|sp_before_tr_cmt=force|sp_before_tr_cmt=not_defined
+Choices=sp_before_tr_cmt\s*=\s*ignore|sp_before_tr_cmt\s*=\s*add|sp_before_tr_cmt\s*=\s*remove|sp_before_tr_cmt\s*=\s*force|sp_before_tr_cmt\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Tr Cmt|Add Sp Before Tr Cmt|Remove Sp Before Tr Cmt|Force Sp Before Tr Cmt"
 ValueDefault=ignore
 
@@ -2308,7 +2433,7 @@ Category=1
 Description="<html>Number of spaces before a trailing comment.</html>"
 Enabled=false
 EditorType=numeric
-CallName="sp_num_before_tr_cmt="
+CallName="sp_num_before_tr_cmt\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2318,7 +2443,7 @@ Category=1
 Description="<html>Add or remove space before an embedded comment.<br/><br/>Default: force</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_before_emb_cmt=ignore|sp_before_emb_cmt=add|sp_before_emb_cmt=remove|sp_before_emb_cmt=force|sp_before_emb_cmt=not_defined
+Choices=sp_before_emb_cmt\s*=\s*ignore|sp_before_emb_cmt\s*=\s*add|sp_before_emb_cmt\s*=\s*remove|sp_before_emb_cmt\s*=\s*force|sp_before_emb_cmt\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Before Emb Cmt|Add Sp Before Emb Cmt|Remove Sp Before Emb Cmt|Force Sp Before Emb Cmt"
 ValueDefault=force
 
@@ -2327,7 +2452,7 @@ Category=1
 Description="<html>Number of spaces before an embedded comment.<br/><br/>Default: 1</html>"
 Enabled=false
 EditorType=numeric
-CallName="sp_num_before_emb_cmt="
+CallName="sp_num_before_emb_cmt\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=1
@@ -2337,7 +2462,7 @@ Category=1
 Description="<html>Add or remove space after an embedded comment.<br/><br/>Default: force</html>"
 Enabled=false
 EditorType=multiple
-Choices=sp_after_emb_cmt=ignore|sp_after_emb_cmt=add|sp_after_emb_cmt=remove|sp_after_emb_cmt=force|sp_after_emb_cmt=not_defined
+Choices=sp_after_emb_cmt\s*=\s*ignore|sp_after_emb_cmt\s*=\s*add|sp_after_emb_cmt\s*=\s*remove|sp_after_emb_cmt\s*=\s*force|sp_after_emb_cmt\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Emb Cmt|Add Sp After Emb Cmt|Remove Sp After Emb Cmt|Force Sp After Emb Cmt"
 ValueDefault=force
 
@@ -2346,7 +2471,7 @@ Category=1
 Description="<html>Number of spaces after an embedded comment.<br/><br/>Default: 1</html>"
 Enabled=false
 EditorType=numeric
-CallName="sp_num_after_emb_cmt="
+CallName="sp_num_after_emb_cmt\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=1
@@ -2356,7 +2481,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|sp_annotation_paren=not_defined
+Choices=sp_annotation_paren\s*=\s*ignore|sp_annotation_paren\s*=\s*add|sp_annotation_paren\s*=\s*remove|sp_annotation_paren\s*=\s*force|sp_annotation_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Sp Annotation Paren|Add Sp Annotation Paren|Remove Sp Annotation Paren|Force Sp Annotation Paren"
 ValueDefault=ignore
 
@@ -2365,7 +2490,7 @@ 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
+TrueFalse=sp_skip_vbrace_tokens\s*=\s*true|sp_skip_vbrace_tokens\s*=\s*false
 ValueDefault=false
 
 [Sp After Noexcept]
@@ -2373,7 +2498,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|sp_after_noexcept=not_defined
+Choices=sp_after_noexcept\s*=\s*ignore|sp_after_noexcept\s*=\s*add|sp_after_noexcept\s*=\s*remove|sp_after_noexcept\s*=\s*force|sp_after_noexcept\s*=\s*not_defined
 ChoicesReadable="Ignore Sp After Noexcept|Add Sp After Noexcept|Remove Sp After Noexcept|Force Sp After Noexcept"
 ValueDefault=ignore
 
@@ -2382,16 +2507,34 @@ 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
+Choices=sp_vala_after_translation\s*=\s*ignore|sp_vala_after_translation\s*=\s*add|sp_vala_after_translation\s*=\s*remove|sp_vala_after_translation\s*=\s*force|sp_vala_after_translation\s*=\s*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
 
+[Sp Before Bit Colon]
+Category=1
+Description="<html>Add or remove space before a bit colon ':'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_before_bit_colon\s*=\s*ignore|sp_before_bit_colon\s*=\s*add|sp_before_bit_colon\s*=\s*remove|sp_before_bit_colon\s*=\s*force|sp_before_bit_colon\s*=\s*not_defined
+ChoicesReadable="Ignore Sp Before Bit Colon|Add Sp Before Bit Colon|Remove Sp Before Bit Colon|Force Sp Before Bit Colon"
+ValueDefault=ignore
+
+[Sp After Bit Colon]
+Category=1
+Description="<html>Add or remove space after a bit colon ':'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_after_bit_colon\s*=\s*ignore|sp_after_bit_colon\s*=\s*add|sp_after_bit_colon\s*=\s*remove|sp_after_bit_colon\s*=\s*force|sp_after_bit_colon\s*=\s*not_defined
+ChoicesReadable="Ignore Sp After Bit Colon|Add Sp After Bit Colon|Remove Sp After Bit Colon|Force Sp After Bit Colon"
+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
+TrueFalse=force_tab_after_define\s*=\s*true|force_tab_after_define\s*=\s*false
 ValueDefault=false
 
 [Indent Columns]
@@ -2399,7 +2542,7 @@ 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="
+CallName="indent_columns\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=8
@@ -2409,7 +2552,7 @@ Category=2
 Description="<html>Whether to ignore indent for the first continuation line. Subsequent<br/>continuation lines will still be indented to match the first.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_ignore_first_continue=true|indent_ignore_first_continue=false
+TrueFalse=indent_ignore_first_continue\s*=\s*true|indent_ignore_first_continue\s*=\s*false
 ValueDefault=false
 
 [Indent Continue]
@@ -2417,7 +2560,7 @@ 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.<br/>Requires indent_ignore_first_continue=false.</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_continue="
+CallName="indent_continue\s*=\s*"
 MinVal=-16
 MaxVal=16
 ValueDefault=0
@@ -2427,7 +2570,7 @@ 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.<br/>Requires indent_ignore_first_continue=false.</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_continue_class_head="
+CallName="indent_continue_class_head\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2437,7 +2580,7 @@ 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
+TrueFalse=indent_single_newlines\s*=\s*true|indent_single_newlines\s*=\s*false
 ValueDefault=false
 
 [Indent Param]
@@ -2445,7 +2588,7 @@ 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="
+CallName="indent_param\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2455,7 +2598,7 @@ 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"
+Choices="indent_with_tabs\s*=\s*0|indent_with_tabs\s*=\s*1|indent_with_tabs\s*=\s*2"
 ChoicesReadable="Spaces only|Indent with tabs, align with spaces|Indent and align with tabs"
 ValueDefault=1
 
@@ -2464,7 +2607,7 @@ 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
+TrueFalse=indent_cmt_with_tabs\s*=\s*true|indent_cmt_with_tabs\s*=\s*false
 ValueDefault=false
 
 [Indent Align String]
@@ -2472,7 +2615,7 @@ 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
+TrueFalse=indent_align_string\s*=\s*true|indent_align_string\s*=\s*false
 ValueDefault=false
 
 [Indent Xml String]
@@ -2480,7 +2623,7 @@ 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="
+CallName="indent_xml_string\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2490,7 +2633,7 @@ Category=2
 Description="<html>Spaces to indent '{' from level.</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_brace="
+CallName="indent_brace\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2500,7 +2643,7 @@ Category=2
 Description="<html>Whether braces are indented to the body level.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_braces=true|indent_braces=false
+TrueFalse=indent_braces\s*=\s*true|indent_braces\s*=\s*false
 ValueDefault=false
 
 [Indent Braces No Func]
@@ -2508,7 +2651,7 @@ 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
+TrueFalse=indent_braces_no_func\s*=\s*true|indent_braces_no_func\s*=\s*false
 ValueDefault=false
 
 [Indent Braces No Class]
@@ -2516,7 +2659,7 @@ 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
+TrueFalse=indent_braces_no_class\s*=\s*true|indent_braces_no_class\s*=\s*false
 ValueDefault=false
 
 [Indent Braces No Struct]
@@ -2524,7 +2667,7 @@ 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
+TrueFalse=indent_braces_no_struct\s*=\s*true|indent_braces_no_struct\s*=\s*false
 ValueDefault=false
 
 [Indent Brace Parent]
@@ -2532,7 +2675,7 @@ 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
+TrueFalse=indent_brace_parent\s*=\s*true|indent_brace_parent\s*=\s*false
 ValueDefault=false
 
 [Indent Paren Open Brace]
@@ -2540,7 +2683,7 @@ 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
+TrueFalse=indent_paren_open_brace\s*=\s*true|indent_paren_open_brace\s*=\s*false
 ValueDefault=false
 
 [Indent Cs Delegate Brace]
@@ -2548,7 +2691,7 @@ 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
+TrueFalse=indent_cs_delegate_brace\s*=\s*true|indent_cs_delegate_brace\s*=\s*false
 ValueDefault=false
 
 [Indent Cs Delegate Body]
@@ -2556,7 +2699,7 @@ 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
+TrueFalse=indent_cs_delegate_body\s*=\s*true|indent_cs_delegate_body\s*=\s*false
 ValueDefault=false
 
 [Indent Namespace]
@@ -2564,7 +2707,7 @@ Category=2
 Description="<html>Whether to indent the body of a 'namespace'.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_namespace=true|indent_namespace=false
+TrueFalse=indent_namespace\s*=\s*true|indent_namespace\s*=\s*false
 ValueDefault=false
 
 [Indent Namespace Single Indent]
@@ -2572,7 +2715,7 @@ 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
+TrueFalse=indent_namespace_single_indent\s*=\s*true|indent_namespace_single_indent\s*=\s*false
 ValueDefault=false
 
 [Indent Namespace Level]
@@ -2580,7 +2723,7 @@ 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="
+CallName="indent_namespace_level\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2590,7 +2733,7 @@ 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="
+CallName="indent_namespace_limit\s*=\s*"
 MinVal=0
 MaxVal=255
 ValueDefault=0
@@ -2600,7 +2743,7 @@ Category=2
 Description="<html>Whether to indent only in inner namespaces (nested in other namespaces).<br/>Requires indent_namespace=true.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_namespace_inner_only=true|indent_namespace_inner_only=false
+TrueFalse=indent_namespace_inner_only\s*=\s*true|indent_namespace_inner_only\s*=\s*false
 ValueDefault=false
 
 [Indent Extern]
@@ -2608,7 +2751,7 @@ Category=2
 Description="<html>Whether the 'extern "C"' body is indented.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_extern=true|indent_extern=false
+TrueFalse=indent_extern\s*=\s*true|indent_extern\s*=\s*false
 ValueDefault=false
 
 [Indent Class]
@@ -2616,7 +2759,7 @@ Category=2
 Description="<html>Whether the 'class' body is indented.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_class=true|indent_class=false
+TrueFalse=indent_class\s*=\s*true|indent_class\s*=\s*false
 ValueDefault=false
 
 [Indent Ignore Before Class Colon]
@@ -2624,7 +2767,7 @@ Category=2
 Description="<html>Whether to ignore indent for the leading base class colon.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_ignore_before_class_colon=true|indent_ignore_before_class_colon=false
+TrueFalse=indent_ignore_before_class_colon\s*=\s*true|indent_ignore_before_class_colon\s*=\s*false
 ValueDefault=false
 
 [Indent Before Class Colon]
@@ -2632,7 +2775,7 @@ Category=2
 Description="<html>Additional indent before the leading base class colon.<br/>Negative values decrease indent down to the first column.<br/>Requires indent_ignore_before_class_colon=false and a newline break before<br/>the colon (see pos_class_colon and nl_class_colon)</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_before_class_colon="
+CallName="indent_before_class_colon\s*=\s*"
 MinVal=-16
 MaxVal=16
 ValueDefault=0
@@ -2642,7 +2785,7 @@ 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
+TrueFalse=indent_class_colon\s*=\s*true|indent_class_colon\s*=\s*false
 ValueDefault=false
 
 [Indent Class On Colon]
@@ -2650,7 +2793,7 @@ 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
+TrueFalse=indent_class_on_colon\s*=\s*true|indent_class_on_colon\s*=\s*false
 ValueDefault=false
 
 [Indent Ignore Before Constr Colon]
@@ -2658,7 +2801,7 @@ Category=2
 Description="<html>Whether to ignore indent for a leading class initializer colon.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_ignore_before_constr_colon=true|indent_ignore_before_constr_colon=false
+TrueFalse=indent_ignore_before_constr_colon\s*=\s*true|indent_ignore_before_constr_colon\s*=\s*false
 ValueDefault=false
 
 [Indent Constr Colon]
@@ -2666,7 +2809,7 @@ 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
+TrueFalse=indent_constr_colon\s*=\s*true|indent_constr_colon\s*=\s*false
 ValueDefault=false
 
 [Indent Ctor Init Leading]
@@ -2674,7 +2817,7 @@ Category=2
 Description="<html>Virtual indent from the ':' for leading member initializers.<br/><br/>Default: 2</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_ctor_init_leading="
+CallName="indent_ctor_init_leading\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=2
@@ -2684,7 +2827,7 @@ Category=2
 Description="<html>Virtual indent from the ':' for following member initializers.<br/><br/>Default: 2</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_ctor_init_following="
+CallName="indent_ctor_init_following\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=2
@@ -2694,7 +2837,7 @@ 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="
+CallName="indent_ctor_init\s*=\s*"
 MinVal=-16
 MaxVal=16
 ValueDefault=0
@@ -2704,7 +2847,7 @@ 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
+TrueFalse=indent_else_if\s*=\s*true|indent_else_if\s*=\s*false
 ValueDefault=false
 
 [Indent Var Def Blk]
@@ -2712,7 +2855,7 @@ 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="
+CallName="indent_var_def_blk\s*=\s*"
 MinVal=-16
 MaxVal=16
 ValueDefault=0
@@ -2722,7 +2865,7 @@ 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
+TrueFalse=indent_var_def_cont\s*=\s*true|indent_var_def_cont\s*=\s*false
 ValueDefault=false
 
 [Indent Shift]
@@ -2730,7 +2873,7 @@ Category=2
 Description="<html>How to indent continued shift expressions ('&lt;&lt;' and '&gt;&gt;').<br/>Set align_left_shift=false when using this.<br/> 0: Align shift operators instead of indenting them (default)<br/> 1: Indent by one level<br/>-1: Preserve original indentation</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_shift="
+CallName="indent_shift\s*=\s*"
 MinVal=-1
 MaxVal=1
 ValueDefault=0
@@ -2740,7 +2883,7 @@ 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
+TrueFalse=indent_func_def_force_col1\s*=\s*true|indent_func_def_force_col1\s*=\s*false
 ValueDefault=false
 
 [Indent Func Call Param]
@@ -2748,7 +2891,7 @@ 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
+TrueFalse=indent_func_call_param\s*=\s*true|indent_func_call_param\s*=\s*false
 ValueDefault=false
 
 [Indent Func Def Param]
@@ -2756,7 +2899,7 @@ 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
+TrueFalse=indent_func_def_param\s*=\s*true|indent_func_def_param\s*=\s*false
 ValueDefault=false
 
 [Indent Func Def Param Paren Pos Threshold]
@@ -2764,7 +2907,7 @@ 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="
+CallName="indent_func_def_param_paren_pos_threshold\s*=\s*"
 MinVal=0
 MaxVal=160
 ValueDefault=0
@@ -2774,7 +2917,7 @@ 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
+TrueFalse=indent_func_proto_param\s*=\s*true|indent_func_proto_param\s*=\s*false
 ValueDefault=false
 
 [Indent Func Class Param]
@@ -2782,7 +2925,7 @@ 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
+TrueFalse=indent_func_class_param\s*=\s*true|indent_func_class_param\s*=\s*false
 ValueDefault=false
 
 [Indent Func Ctor Var Param]
@@ -2790,7 +2933,7 @@ 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
+TrueFalse=indent_func_ctor_var_param\s*=\s*true|indent_func_ctor_var_param\s*=\s*false
 ValueDefault=false
 
 [Indent Template Param]
@@ -2798,7 +2941,7 @@ 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
+TrueFalse=indent_template_param\s*=\s*true|indent_template_param\s*=\s*false
 ValueDefault=false
 
 [Indent Func Param Double]
@@ -2806,7 +2949,7 @@ 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
+TrueFalse=indent_func_param_double\s*=\s*true|indent_func_param_double\s*=\s*false
 ValueDefault=false
 
 [Indent Func Const]
@@ -2814,7 +2957,7 @@ Category=2
 Description="<html>Indentation column for standalone 'const' qualifier on a function<br/>prototype.</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_func_const="
+CallName="indent_func_const\s*=\s*"
 MinVal=0
 MaxVal=69
 ValueDefault=0
@@ -2824,7 +2967,7 @@ Category=2
 Description="<html>Indentation column for standalone 'throw' qualifier on a function<br/>prototype.</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_func_throw="
+CallName="indent_func_throw\s*=\s*"
 MinVal=0
 MaxVal=41
 ValueDefault=0
@@ -2834,7 +2977,7 @@ 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 ` 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
+TrueFalse=indent_macro_brace\s*=\s*true|indent_macro_brace\s*=\s*false
 ValueDefault=true
 
 [Indent Member]
@@ -2842,7 +2985,7 @@ 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="
+CallName="indent_member\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2852,7 +2995,7 @@ 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
+TrueFalse=indent_member_single\s*=\s*true|indent_member_single\s*=\s*false
 ValueDefault=false
 
 [Indent Single Line Comments Before]
@@ -2860,7 +3003,7 @@ Category=2
 Description="<html>Spaces to indent single line ('//') comments on lines before code.</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_single_line_comments_before="
+CallName="indent_single_line_comments_before\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2870,7 +3013,7 @@ Category=2
 Description="<html>Spaces to indent single line ('//') comments on lines after code.</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_single_line_comments_after="
+CallName="indent_single_line_comments_after\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2880,7 +3023,7 @@ 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="
+CallName="indent_sparen_extra\s*=\s*"
 MinVal=-16
 MaxVal=16
 ValueDefault=0
@@ -2890,7 +3033,7 @@ 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
+TrueFalse=indent_relative_single_line_comments\s*=\s*true|indent_relative_single_line_comments\s*=\s*false
 ValueDefault=false
 
 [Indent Switch Case]
@@ -2898,7 +3041,7 @@ Category=2
 Description="<html>Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.<br/>It might be wise to choose the same value for the option indent_case_brace.</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_switch_case="
+CallName="indent_switch_case\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2908,7 +3051,7 @@ Category=2
 Description="<html>Spaces to indent the body of a 'switch' before any 'case'.<br/>Usually the same as indent_columns or indent_switch_case.</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_switch_body="
+CallName="indent_switch_body\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2918,7 +3061,7 @@ Category=2
 Description="<html>Whether to ignore indent for '{' following 'case'.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_ignore_case_brace=true|indent_ignore_case_brace=false
+TrueFalse=indent_ignore_case_brace\s*=\s*true|indent_ignore_case_brace\s*=\s*false
 ValueDefault=false
 
 [Indent Case Brace]
@@ -2926,7 +3069,7 @@ 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 be wise to choose the same value for the option indent_switch_case.</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_case_brace="
+CallName="indent_case_brace\s*=\s*"
 MinVal=-16
 MaxVal=16
 ValueDefault=0
@@ -2936,7 +3079,7 @@ 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
+TrueFalse=indent_switch_break_with_case\s*=\s*true|indent_switch_break_with_case\s*=\s*false
 ValueDefault=false
 
 [Indent Switch Pp]
@@ -2944,7 +3087,7 @@ 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
+TrueFalse=indent_switch_pp\s*=\s*true|indent_switch_pp\s*=\s*false
 ValueDefault=true
 
 [Indent Case Shift]
@@ -2952,7 +3095,7 @@ 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="
+CallName="indent_case_shift\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -2962,7 +3105,7 @@ Category=2
 Description="<html>Whether to align comments before 'case' with the 'case'.<br/><br/>Default: true</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_case_comment=true|indent_case_comment=false
+TrueFalse=indent_case_comment\s*=\s*true|indent_case_comment\s*=\s*false
 ValueDefault=true
 
 [Indent Comment]
@@ -2970,7 +3113,7 @@ Category=2
 Description="<html>Whether to indent comments not found in first column.<br/><br/>Default: true</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_comment=true|indent_comment=false
+TrueFalse=indent_comment\s*=\s*true|indent_comment\s*=\s*false
 ValueDefault=true
 
 [Indent Col1 Comment]
@@ -2978,7 +3121,7 @@ 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
+TrueFalse=indent_col1_comment\s*=\s*true|indent_col1_comment\s*=\s*false
 ValueDefault=false
 
 [Indent Col1 Multi String Literal]
@@ -2986,7 +3129,7 @@ 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
+TrueFalse=indent_col1_multi_string_literal\s*=\s*true|indent_col1_multi_string_literal\s*=\s*false
 ValueDefault=false
 
 [Indent Comment Align Thresh]
@@ -2994,7 +3137,7 @@ Category=2
 Description="<html>Align comments on adjacent lines that are this many columns apart or less.<br/><br/>Default: 3</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_comment_align_thresh="
+CallName="indent_comment_align_thresh\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=3
@@ -3004,7 +3147,7 @@ Category=2
 Description="<html>Whether to ignore indent for goto labels.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_ignore_label=true|indent_ignore_label=false
+TrueFalse=indent_ignore_label\s*=\s*true|indent_ignore_label\s*=\s*false
 ValueDefault=false
 
 [Indent Label]
@@ -3012,7 +3155,7 @@ Category=2
 Description="<html>How to indent goto labels. Requires indent_ignore_label=false.<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="
+CallName="indent_label\s*=\s*"
 MinVal=-16
 MaxVal=16
 ValueDefault=1
@@ -3022,7 +3165,7 @@ 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="
+CallName="indent_access_spec\s*=\s*"
 MinVal=-16
 MaxVal=16
 ValueDefault=1
@@ -3032,7 +3175,7 @@ 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
+TrueFalse=indent_access_spec_body\s*=\s*true|indent_access_spec_body\s*=\s*false
 ValueDefault=false
 
 [Indent Paren Nl]
@@ -3040,7 +3183,7 @@ 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
+TrueFalse=indent_paren_nl\s*=\s*true|indent_paren_nl\s*=\s*false
 ValueDefault=false
 
 [Indent Paren Close]
@@ -3048,7 +3191,7 @@ 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<br/>-1: Preserve original indentation</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_paren_close="
+CallName="indent_paren_close\s*=\s*"
 MinVal=-1
 MaxVal=2
 ValueDefault=0
@@ -3058,7 +3201,7 @@ 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
+TrueFalse=indent_paren_after_func_def\s*=\s*true|indent_paren_after_func_def\s*=\s*false
 ValueDefault=false
 
 [Indent Paren After Func Decl]
@@ -3066,7 +3209,7 @@ 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
+TrueFalse=indent_paren_after_func_decl\s*=\s*true|indent_paren_after_func_decl\s*=\s*false
 ValueDefault=false
 
 [Indent Paren After Func Call]
@@ -3074,7 +3217,7 @@ 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
+TrueFalse=indent_paren_after_func_call\s*=\s*true|indent_paren_after_func_call\s*=\s*false
 ValueDefault=false
 
 [Indent Comma Brace]
@@ -3082,7 +3225,7 @@ Category=2
 Description="<html>How to indent a comma when inside braces.<br/> 0: Indent by one level (default)<br/> 1: Align under the open brace<br/>-1: Preserve original indentation</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_comma_brace="
+CallName="indent_comma_brace\s*=\s*"
 MinVal=-1
 MaxVal=1
 ValueDefault=0
@@ -3092,7 +3235,7 @@ Category=2
 Description="<html>How to indent a comma when inside parentheses.<br/> 0: Indent by one level (default)<br/> 1: Align under the open parenthesis<br/>-1: Preserve original indentation</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_comma_paren="
+CallName="indent_comma_paren\s*=\s*"
 MinVal=-1
 MaxVal=1
 ValueDefault=0
@@ -3102,7 +3245,7 @@ Category=2
 Description="<html>How to indent a Boolean operator when inside parentheses.<br/> 0: Indent by one level (default)<br/> 1: Align under the open parenthesis<br/>-1: Preserve original indentation</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_bool_paren="
+CallName="indent_bool_paren\s*=\s*"
 MinVal=-1
 MaxVal=1
 ValueDefault=0
@@ -3112,7 +3255,7 @@ Category=2
 Description="<html>Whether to ignore the indentation of a Boolean operator when outside<br/>parentheses.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_ignore_bool=true|indent_ignore_bool=false
+TrueFalse=indent_ignore_bool\s*=\s*true|indent_ignore_bool\s*=\s*false
 ValueDefault=false
 
 [Indent Ignore Arith]
@@ -3120,7 +3263,7 @@ Category=2
 Description="<html>Whether to ignore the indentation of an arithmetic operator.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_ignore_arith=true|indent_ignore_arith=false
+TrueFalse=indent_ignore_arith\s*=\s*true|indent_ignore_arith\s*=\s*false
 ValueDefault=false
 
 [Indent Semicolon For Paren]
@@ -3128,7 +3271,7 @@ 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
+TrueFalse=indent_semicolon_for_paren\s*=\s*true|indent_semicolon_for_paren\s*=\s*false
 ValueDefault=false
 
 [Indent Ignore Semicolon]
@@ -3136,7 +3279,7 @@ Category=2
 Description="<html>Whether to ignore the indentation of a semicolon outside of a 'for'<br/>statement.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_ignore_semicolon=true|indent_ignore_semicolon=false
+TrueFalse=indent_ignore_semicolon\s*=\s*true|indent_ignore_semicolon\s*=\s*false
 ValueDefault=false
 
 [Indent First Bool Expr]
@@ -3144,7 +3287,7 @@ Category=2
 Description="<html>Whether to align the first expression to following ones<br/>if indent_bool_paren=1.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_first_bool_expr=true|indent_first_bool_expr=false
+TrueFalse=indent_first_bool_expr\s*=\s*true|indent_first_bool_expr\s*=\s*false
 ValueDefault=false
 
 [Indent First For Expr]
@@ -3152,7 +3295,7 @@ 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
+TrueFalse=indent_first_for_expr\s*=\s*true|indent_first_for_expr\s*=\s*false
 ValueDefault=false
 
 [Indent Square Nl]
@@ -3160,7 +3303,7 @@ 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
+TrueFalse=indent_square_nl\s*=\s*true|indent_square_nl\s*=\s*false
 ValueDefault=false
 
 [Indent Preserve Sql]
@@ -3168,7 +3311,7 @@ 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
+TrueFalse=indent_preserve_sql\s*=\s*true|indent_preserve_sql\s*=\s*false
 ValueDefault=false
 
 [Indent Ignore Assign]
@@ -3176,7 +3319,7 @@ Category=2
 Description="<html>Whether to ignore the indentation of an assignment operator.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_ignore_assign=true|indent_ignore_assign=false
+TrueFalse=indent_ignore_assign\s*=\s*true|indent_ignore_assign\s*=\s*false
 ValueDefault=false
 
 [Indent Align Assign]
@@ -3184,7 +3327,7 @@ 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
+TrueFalse=indent_align_assign\s*=\s*true|indent_align_assign\s*=\s*false
 ValueDefault=true
 
 [Indent Off After Assign]
@@ -3192,7 +3335,7 @@ 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
+TrueFalse=indent_off_after_assign\s*=\s*true|indent_off_after_assign\s*=\s*false
 ValueDefault=false
 
 [Indent Align Paren]
@@ -3200,7 +3343,7 @@ 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
+TrueFalse=indent_align_paren\s*=\s*true|indent_align_paren\s*=\s*false
 ValueDefault=true
 
 [Indent Oc Inside Msg Sel]
@@ -3208,7 +3351,7 @@ 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
+TrueFalse=indent_oc_inside_msg_sel\s*=\s*true|indent_oc_inside_msg_sel\s*=\s*false
 ValueDefault=false
 
 [Indent Oc Block]
@@ -3216,7 +3359,7 @@ 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
+TrueFalse=indent_oc_block\s*=\s*true|indent_oc_block\s*=\s*false
 ValueDefault=false
 
 [Indent Oc Block Msg]
@@ -3224,7 +3367,7 @@ 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="
+CallName="indent_oc_block_msg\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -3234,7 +3377,7 @@ Category=2
 Description="<html>(OC) Minimum indent for subsequent parameters</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_oc_msg_colon="
+CallName="indent_oc_msg_colon\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -3244,7 +3387,7 @@ 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
+TrueFalse=indent_oc_msg_prioritize_first_colon\s*=\s*true|indent_oc_msg_prioritize_first_colon\s*=\s*false
 ValueDefault=true
 
 [Indent Oc Block Msg Xcode Style]
@@ -3252,7 +3395,7 @@ 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
+TrueFalse=indent_oc_block_msg_xcode_style\s*=\s*true|indent_oc_block_msg_xcode_style\s*=\s*false
 ValueDefault=false
 
 [Indent Oc Block Msg From Keyword]
@@ -3260,7 +3403,7 @@ 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
+TrueFalse=indent_oc_block_msg_from_keyword\s*=\s*true|indent_oc_block_msg_from_keyword\s*=\s*false
 ValueDefault=false
 
 [Indent Oc Block Msg From Colon]
@@ -3268,7 +3411,7 @@ 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
+TrueFalse=indent_oc_block_msg_from_colon\s*=\s*true|indent_oc_block_msg_from_colon\s*=\s*false
 ValueDefault=false
 
 [Indent Oc Block Msg From Caret]
@@ -3276,7 +3419,7 @@ 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
+TrueFalse=indent_oc_block_msg_from_caret\s*=\s*true|indent_oc_block_msg_from_caret\s*=\s*false
 ValueDefault=false
 
 [Indent Oc Block Msg From Brace]
@@ -3284,7 +3427,7 @@ 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
+TrueFalse=indent_oc_block_msg_from_brace\s*=\s*true|indent_oc_block_msg_from_brace\s*=\s*false
 ValueDefault=false
 
 [Indent Min Vbrace Open]
@@ -3292,7 +3435,7 @@ 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="
+CallName="indent_min_vbrace_open\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -3302,7 +3445,7 @@ 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
+TrueFalse=indent_vbrace_open_on_tabstop\s*=\s*true|indent_vbrace_open_on_tabstop\s*=\s*false
 ValueDefault=false
 
 [Indent Token After Brace]
@@ -3310,7 +3453,7 @@ 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
+TrueFalse=indent_token_after_brace\s*=\s*true|indent_token_after_brace\s*=\s*false
 ValueDefault=true
 
 [Indent Cpp Lambda Body]
@@ -3318,7 +3461,7 @@ 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
+TrueFalse=indent_cpp_lambda_body\s*=\s*true|indent_cpp_lambda_body\s*=\s*false
 ValueDefault=false
 
 [Indent Compound Literal Return]
@@ -3326,7 +3469,7 @@ 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
+TrueFalse=indent_compound_literal_return\s*=\s*true|indent_compound_literal_return\s*=\s*false
 ValueDefault=true
 
 [Indent Using Block]
@@ -3334,7 +3477,7 @@ 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
+TrueFalse=indent_using_block\s*=\s*true|indent_using_block\s*=\s*false
 ValueDefault=true
 
 [Indent Ternary Operator]
@@ -3342,7 +3485,7 @@ 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 the `if_true` branch<br/>2: When the `:` is a continuation, indent it under `?`</html>"
 Enabled=false
 EditorType=numeric
-CallName="indent_ternary_operator="
+CallName="indent_ternary_operator\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -3352,7 +3495,7 @@ 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
+TrueFalse=indent_inside_ternary_operator\s*=\s*true|indent_inside_ternary_operator\s*=\s*false
 ValueDefault=false
 
 [Indent Off After Return]
@@ -3360,7 +3503,7 @@ 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
+TrueFalse=indent_off_after_return\s*=\s*true|indent_off_after_return\s*=\s*false
 ValueDefault=false
 
 [Indent Off After Return New]
@@ -3368,7 +3511,7 @@ 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
+TrueFalse=indent_off_after_return_new\s*=\s*true|indent_off_after_return_new\s*=\s*false
 ValueDefault=false
 
 [Indent Single After Return]
@@ -3376,7 +3519,7 @@ 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
+TrueFalse=indent_single_after_return\s*=\s*true|indent_single_after_return\s*=\s*false
 ValueDefault=false
 
 [Indent Ignore Asm Block]
@@ -3384,7 +3527,7 @@ 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
+TrueFalse=indent_ignore_asm_block\s*=\s*true|indent_ignore_asm_block\s*=\s*false
 ValueDefault=false
 
 [Donot Indent Func Def Close Paren]
@@ -3392,7 +3535,7 @@ 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
+TrueFalse=donot_indent_func_def_close_paren\s*=\s*true|donot_indent_func_def_close_paren\s*=\s*false
 ValueDefault=false
 
 [Nl Collapse Empty Body]
@@ -3400,7 +3543,7 @@ Category=3
 Description="<html>Whether to collapse empty blocks between '{' and '}' except for functions.<br/>Use nl_collapse_empty_body_functions to specify how empty function braces<br/>should be formatted.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=nl_collapse_empty_body=true|nl_collapse_empty_body=false
+TrueFalse=nl_collapse_empty_body\s*=\s*true|nl_collapse_empty_body\s*=\s*false
 ValueDefault=false
 
 [Nl Collapse Empty Body Functions]
@@ -3408,7 +3551,7 @@ Category=3
 Description="<html>Whether to collapse empty blocks between '{' and '}' for functions only.<br/>If true, overrides nl_inside_empty_func.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=nl_collapse_empty_body_functions=true|nl_collapse_empty_body_functions=false
+TrueFalse=nl_collapse_empty_body_functions\s*=\s*true|nl_collapse_empty_body_functions\s*=\s*false
 ValueDefault=false
 
 [Nl Assign Leave One Liners]
@@ -3416,7 +3559,7 @@ 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
+TrueFalse=nl_assign_leave_one_liners\s*=\s*true|nl_assign_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl Class Leave One Liners]
@@ -3424,7 +3567,7 @@ 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
+TrueFalse=nl_class_leave_one_liners\s*=\s*true|nl_class_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl Enum Leave One Liners]
@@ -3432,7 +3575,7 @@ 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
+TrueFalse=nl_enum_leave_one_liners\s*=\s*true|nl_enum_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl Getset Leave One Liners]
@@ -3440,7 +3583,7 @@ 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
+TrueFalse=nl_getset_leave_one_liners\s*=\s*true|nl_getset_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl Cs Property Leave One Liners]
@@ -3448,7 +3591,7 @@ 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
+TrueFalse=nl_cs_property_leave_one_liners\s*=\s*true|nl_cs_property_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl Func Leave One Liners]
@@ -3456,7 +3599,7 @@ 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
+TrueFalse=nl_func_leave_one_liners\s*=\s*true|nl_func_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl Cpp Lambda Leave One Liners]
@@ -3464,7 +3607,7 @@ 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
+TrueFalse=nl_cpp_lambda_leave_one_liners\s*=\s*true|nl_cpp_lambda_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl If Leave One Liners]
@@ -3472,7 +3615,7 @@ 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
+TrueFalse=nl_if_leave_one_liners\s*=\s*true|nl_if_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl While Leave One Liners]
@@ -3480,7 +3623,7 @@ 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
+TrueFalse=nl_while_leave_one_liners\s*=\s*true|nl_while_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl Do Leave One Liners]
@@ -3488,7 +3631,7 @@ 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
+TrueFalse=nl_do_leave_one_liners\s*=\s*true|nl_do_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl For Leave One Liners]
@@ -3496,7 +3639,7 @@ 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
+TrueFalse=nl_for_leave_one_liners\s*=\s*true|nl_for_leave_one_liners\s*=\s*false
 ValueDefault=false
 
 [Nl Oc Msg Leave One Liner]
@@ -3504,7 +3647,7 @@ 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
+TrueFalse=nl_oc_msg_leave_one_liner\s*=\s*true|nl_oc_msg_leave_one_liner\s*=\s*false
 ValueDefault=false
 
 [Nl Oc Mdef Brace]
@@ -3512,7 +3655,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|nl_oc_mdef_brace=not_defined
+Choices=nl_oc_mdef_brace\s*=\s*ignore|nl_oc_mdef_brace\s*=\s*add|nl_oc_mdef_brace\s*=\s*remove|nl_oc_mdef_brace\s*=\s*force|nl_oc_mdef_brace\s*=\s*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
 
@@ -3521,7 +3664,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|nl_oc_block_brace=not_defined
+Choices=nl_oc_block_brace\s*=\s*ignore|nl_oc_block_brace\s*=\s*add|nl_oc_block_brace\s*=\s*remove|nl_oc_block_brace\s*=\s*force|nl_oc_block_brace\s*=\s*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
 
@@ -3530,7 +3673,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|nl_oc_before_interface=not_defined
+Choices=nl_oc_before_interface\s*=\s*ignore|nl_oc_before_interface\s*=\s*add|nl_oc_before_interface\s*=\s*remove|nl_oc_before_interface\s*=\s*force|nl_oc_before_interface\s*=\s*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
 
@@ -3539,7 +3682,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|nl_oc_before_implementation=not_defined
+Choices=nl_oc_before_implementation\s*=\s*ignore|nl_oc_before_implementation\s*=\s*add|nl_oc_before_implementation\s*=\s*remove|nl_oc_before_implementation\s*=\s*force|nl_oc_before_implementation\s*=\s*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
 
@@ -3548,7 +3691,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|nl_oc_before_end=not_defined
+Choices=nl_oc_before_end\s*=\s*ignore|nl_oc_before_end\s*=\s*add|nl_oc_before_end\s*=\s*remove|nl_oc_before_end\s*=\s*force|nl_oc_before_end\s*=\s*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
 
@@ -3557,7 +3700,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|nl_oc_interface_brace=not_defined
+Choices=nl_oc_interface_brace\s*=\s*ignore|nl_oc_interface_brace\s*=\s*add|nl_oc_interface_brace\s*=\s*remove|nl_oc_interface_brace\s*=\s*force|nl_oc_interface_brace\s*=\s*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
 
@@ -3566,7 +3709,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|nl_oc_implementation_brace=not_defined
+Choices=nl_oc_implementation_brace\s*=\s*ignore|nl_oc_implementation_brace\s*=\s*add|nl_oc_implementation_brace\s*=\s*remove|nl_oc_implementation_brace\s*=\s*force|nl_oc_implementation_brace\s*=\s*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
 
@@ -3575,7 +3718,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|nl_start_of_file=not_defined
+Choices=nl_start_of_file\s*=\s*ignore|nl_start_of_file\s*=\s*add|nl_start_of_file\s*=\s*remove|nl_start_of_file\s*=\s*force|nl_start_of_file\s*=\s*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
 
@@ -3584,7 +3727,7 @@ 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="
+CallName="nl_start_of_file_min\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -3594,7 +3737,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|nl_end_of_file=not_defined
+Choices=nl_end_of_file\s*=\s*ignore|nl_end_of_file\s*=\s*add|nl_end_of_file\s*=\s*remove|nl_end_of_file\s*=\s*force|nl_end_of_file\s*=\s*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
 
@@ -3603,7 +3746,7 @@ 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="
+CallName="nl_end_of_file_min\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -3613,7 +3756,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|nl_assign_brace=not_defined
+Choices=nl_assign_brace\s*=\s*ignore|nl_assign_brace\s*=\s*add|nl_assign_brace\s*=\s*remove|nl_assign_brace\s*=\s*force|nl_assign_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Assign Brace|Add Nl Assign Brace|Remove Nl Assign Brace|Force Nl Assign Brace"
 ValueDefault=ignore
 
@@ -3622,7 +3765,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|nl_assign_square=not_defined
+Choices=nl_assign_square\s*=\s*ignore|nl_assign_square\s*=\s*add|nl_assign_square\s*=\s*remove|nl_assign_square\s*=\s*force|nl_assign_square\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Assign Square|Add Nl Assign Square|Remove Nl Assign Square|Force Nl Assign Square"
 ValueDefault=ignore
 
@@ -3631,7 +3774,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|nl_tsquare_brace=not_defined
+Choices=nl_tsquare_brace\s*=\s*ignore|nl_tsquare_brace\s*=\s*add|nl_tsquare_brace\s*=\s*remove|nl_tsquare_brace\s*=\s*force|nl_tsquare_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Tsquare Brace|Add Nl Tsquare Brace|Remove Nl Tsquare Brace|Force Nl Tsquare Brace"
 ValueDefault=ignore
 
@@ -3640,7 +3783,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|nl_after_square_assign=not_defined
+Choices=nl_after_square_assign\s*=\s*ignore|nl_after_square_assign\s*=\s*add|nl_after_square_assign\s*=\s*remove|nl_after_square_assign\s*=\s*force|nl_after_square_assign\s*=\s*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
 
@@ -3649,7 +3792,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|nl_fcall_brace=not_defined
+Choices=nl_fcall_brace\s*=\s*ignore|nl_fcall_brace\s*=\s*add|nl_fcall_brace\s*=\s*remove|nl_fcall_brace\s*=\s*force|nl_fcall_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Fcall Brace|Add Nl Fcall Brace|Remove Nl Fcall Brace|Force Nl Fcall Brace"
 ValueDefault=ignore
 
@@ -3658,7 +3801,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|nl_enum_brace=not_defined
+Choices=nl_enum_brace\s*=\s*ignore|nl_enum_brace\s*=\s*add|nl_enum_brace\s*=\s*remove|nl_enum_brace\s*=\s*force|nl_enum_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Enum Brace|Add Nl Enum Brace|Remove Nl Enum Brace|Force Nl Enum Brace"
 ValueDefault=ignore
 
@@ -3667,7 +3810,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|nl_enum_class=not_defined
+Choices=nl_enum_class\s*=\s*ignore|nl_enum_class\s*=\s*add|nl_enum_class\s*=\s*remove|nl_enum_class\s*=\s*force|nl_enum_class\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Enum Class|Add Nl Enum Class|Remove Nl Enum Class|Force Nl Enum Class"
 ValueDefault=ignore
 
@@ -3676,7 +3819,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|nl_enum_class_identifier=not_defined
+Choices=nl_enum_class_identifier\s*=\s*ignore|nl_enum_class_identifier\s*=\s*add|nl_enum_class_identifier\s*=\s*remove|nl_enum_class_identifier\s*=\s*force|nl_enum_class_identifier\s*=\s*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
 
@@ -3685,7 +3828,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|nl_enum_identifier_colon=not_defined
+Choices=nl_enum_identifier_colon\s*=\s*ignore|nl_enum_identifier_colon\s*=\s*add|nl_enum_identifier_colon\s*=\s*remove|nl_enum_identifier_colon\s*=\s*force|nl_enum_identifier_colon\s*=\s*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
 
@@ -3694,7 +3837,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|nl_enum_colon_type=not_defined
+Choices=nl_enum_colon_type\s*=\s*ignore|nl_enum_colon_type\s*=\s*add|nl_enum_colon_type\s*=\s*remove|nl_enum_colon_type\s*=\s*force|nl_enum_colon_type\s*=\s*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
 
@@ -3703,7 +3846,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|nl_struct_brace=not_defined
+Choices=nl_struct_brace\s*=\s*ignore|nl_struct_brace\s*=\s*add|nl_struct_brace\s*=\s*remove|nl_struct_brace\s*=\s*force|nl_struct_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Struct Brace|Add Nl Struct Brace|Remove Nl Struct Brace|Force Nl Struct Brace"
 ValueDefault=ignore
 
@@ -3712,7 +3855,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|nl_union_brace=not_defined
+Choices=nl_union_brace\s*=\s*ignore|nl_union_brace\s*=\s*add|nl_union_brace\s*=\s*remove|nl_union_brace\s*=\s*force|nl_union_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Union Brace|Add Nl Union Brace|Remove Nl Union Brace|Force Nl Union Brace"
 ValueDefault=ignore
 
@@ -3721,7 +3864,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|nl_if_brace=not_defined
+Choices=nl_if_brace\s*=\s*ignore|nl_if_brace\s*=\s*add|nl_if_brace\s*=\s*remove|nl_if_brace\s*=\s*force|nl_if_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl If Brace|Add Nl If Brace|Remove Nl If Brace|Force Nl If Brace"
 ValueDefault=ignore
 
@@ -3730,7 +3873,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|nl_brace_else=not_defined
+Choices=nl_brace_else\s*=\s*ignore|nl_brace_else\s*=\s*add|nl_brace_else\s*=\s*remove|nl_brace_else\s*=\s*force|nl_brace_else\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Brace Else|Add Nl Brace Else|Remove Nl Brace Else|Force Nl Brace Else"
 ValueDefault=ignore
 
@@ -3739,7 +3882,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|nl_elseif_brace=not_defined
+Choices=nl_elseif_brace\s*=\s*ignore|nl_elseif_brace\s*=\s*add|nl_elseif_brace\s*=\s*remove|nl_elseif_brace\s*=\s*force|nl_elseif_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Elseif Brace|Add Nl Elseif Brace|Remove Nl Elseif Brace|Force Nl Elseif Brace"
 ValueDefault=ignore
 
@@ -3748,7 +3891,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|nl_else_brace=not_defined
+Choices=nl_else_brace\s*=\s*ignore|nl_else_brace\s*=\s*add|nl_else_brace\s*=\s*remove|nl_else_brace\s*=\s*force|nl_else_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Else Brace|Add Nl Else Brace|Remove Nl Else Brace|Force Nl Else Brace"
 ValueDefault=ignore
 
@@ -3757,7 +3900,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|nl_else_if=not_defined
+Choices=nl_else_if\s*=\s*ignore|nl_else_if\s*=\s*add|nl_else_if\s*=\s*remove|nl_else_if\s*=\s*force|nl_else_if\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Else If|Add Nl Else If|Remove Nl Else If|Force Nl Else If"
 ValueDefault=ignore
 
@@ -3766,7 +3909,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|nl_before_opening_brace_func_class_def=not_defined
+Choices=nl_before_opening_brace_func_class_def\s*=\s*ignore|nl_before_opening_brace_func_class_def\s*=\s*add|nl_before_opening_brace_func_class_def\s*=\s*remove|nl_before_opening_brace_func_class_def\s*=\s*force|nl_before_opening_brace_func_class_def\s*=\s*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
 
@@ -3775,7 +3918,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|nl_before_if_closing_paren=not_defined
+Choices=nl_before_if_closing_paren\s*=\s*ignore|nl_before_if_closing_paren\s*=\s*add|nl_before_if_closing_paren\s*=\s*remove|nl_before_if_closing_paren\s*=\s*force|nl_before_if_closing_paren\s*=\s*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
 
@@ -3784,7 +3927,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|nl_brace_finally=not_defined
+Choices=nl_brace_finally\s*=\s*ignore|nl_brace_finally\s*=\s*add|nl_brace_finally\s*=\s*remove|nl_brace_finally\s*=\s*force|nl_brace_finally\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Brace Finally|Add Nl Brace Finally|Remove Nl Brace Finally|Force Nl Brace Finally"
 ValueDefault=ignore
 
@@ -3793,7 +3936,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|nl_finally_brace=not_defined
+Choices=nl_finally_brace\s*=\s*ignore|nl_finally_brace\s*=\s*add|nl_finally_brace\s*=\s*remove|nl_finally_brace\s*=\s*force|nl_finally_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Finally Brace|Add Nl Finally Brace|Remove Nl Finally Brace|Force Nl Finally Brace"
 ValueDefault=ignore
 
@@ -3802,7 +3945,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|nl_try_brace=not_defined
+Choices=nl_try_brace\s*=\s*ignore|nl_try_brace\s*=\s*add|nl_try_brace\s*=\s*remove|nl_try_brace\s*=\s*force|nl_try_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Try Brace|Add Nl Try Brace|Remove Nl Try Brace|Force Nl Try Brace"
 ValueDefault=ignore
 
@@ -3811,7 +3954,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|nl_getset_brace=not_defined
+Choices=nl_getset_brace\s*=\s*ignore|nl_getset_brace\s*=\s*add|nl_getset_brace\s*=\s*remove|nl_getset_brace\s*=\s*force|nl_getset_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Getset Brace|Add Nl Getset Brace|Remove Nl Getset Brace|Force Nl Getset Brace"
 ValueDefault=ignore
 
@@ -3820,7 +3963,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|nl_for_brace=not_defined
+Choices=nl_for_brace\s*=\s*ignore|nl_for_brace\s*=\s*add|nl_for_brace\s*=\s*remove|nl_for_brace\s*=\s*force|nl_for_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl For Brace|Add Nl For Brace|Remove Nl For Brace|Force Nl For Brace"
 ValueDefault=ignore
 
@@ -3829,7 +3972,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|nl_catch_brace=not_defined
+Choices=nl_catch_brace\s*=\s*ignore|nl_catch_brace\s*=\s*add|nl_catch_brace\s*=\s*remove|nl_catch_brace\s*=\s*force|nl_catch_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Catch Brace|Add Nl Catch Brace|Remove Nl Catch Brace|Force Nl Catch Brace"
 ValueDefault=ignore
 
@@ -3838,7 +3981,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|nl_oc_catch_brace=not_defined
+Choices=nl_oc_catch_brace\s*=\s*ignore|nl_oc_catch_brace\s*=\s*add|nl_oc_catch_brace\s*=\s*remove|nl_oc_catch_brace\s*=\s*force|nl_oc_catch_brace\s*=\s*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
 
@@ -3847,7 +3990,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|nl_brace_catch=not_defined
+Choices=nl_brace_catch\s*=\s*ignore|nl_brace_catch\s*=\s*add|nl_brace_catch\s*=\s*remove|nl_brace_catch\s*=\s*force|nl_brace_catch\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Brace Catch|Add Nl Brace Catch|Remove Nl Brace Catch|Force Nl Brace Catch"
 ValueDefault=ignore
 
@@ -3856,7 +3999,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|nl_oc_brace_catch=not_defined
+Choices=nl_oc_brace_catch\s*=\s*ignore|nl_oc_brace_catch\s*=\s*add|nl_oc_brace_catch\s*=\s*remove|nl_oc_brace_catch\s*=\s*force|nl_oc_brace_catch\s*=\s*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
 
@@ -3865,7 +4008,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|nl_brace_square=not_defined
+Choices=nl_brace_square\s*=\s*ignore|nl_brace_square\s*=\s*add|nl_brace_square\s*=\s*remove|nl_brace_square\s*=\s*force|nl_brace_square\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Brace Square|Add Nl Brace Square|Remove Nl Brace Square|Force Nl Brace Square"
 ValueDefault=ignore
 
@@ -3874,7 +4017,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|nl_brace_fparen=not_defined
+Choices=nl_brace_fparen\s*=\s*ignore|nl_brace_fparen\s*=\s*add|nl_brace_fparen\s*=\s*remove|nl_brace_fparen\s*=\s*force|nl_brace_fparen\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Brace Fparen|Add Nl Brace Fparen|Remove Nl Brace Fparen|Force Nl Brace Fparen"
 ValueDefault=ignore
 
@@ -3883,7 +4026,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|nl_while_brace=not_defined
+Choices=nl_while_brace\s*=\s*ignore|nl_while_brace\s*=\s*add|nl_while_brace\s*=\s*remove|nl_while_brace\s*=\s*force|nl_while_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl While Brace|Add Nl While Brace|Remove Nl While Brace|Force Nl While Brace"
 ValueDefault=ignore
 
@@ -3892,7 +4035,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|nl_scope_brace=not_defined
+Choices=nl_scope_brace\s*=\s*ignore|nl_scope_brace\s*=\s*add|nl_scope_brace\s*=\s*remove|nl_scope_brace\s*=\s*force|nl_scope_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Scope Brace|Add Nl Scope Brace|Remove Nl Scope Brace|Force Nl Scope Brace"
 ValueDefault=ignore
 
@@ -3901,7 +4044,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|nl_unittest_brace=not_defined
+Choices=nl_unittest_brace\s*=\s*ignore|nl_unittest_brace\s*=\s*add|nl_unittest_brace\s*=\s*remove|nl_unittest_brace\s*=\s*force|nl_unittest_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Unittest Brace|Add Nl Unittest Brace|Remove Nl Unittest Brace|Force Nl Unittest Brace"
 ValueDefault=ignore
 
@@ -3910,7 +4053,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|nl_version_brace=not_defined
+Choices=nl_version_brace\s*=\s*ignore|nl_version_brace\s*=\s*add|nl_version_brace\s*=\s*remove|nl_version_brace\s*=\s*force|nl_version_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Version Brace|Add Nl Version Brace|Remove Nl Version Brace|Force Nl Version Brace"
 ValueDefault=ignore
 
@@ -3919,7 +4062,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|nl_using_brace=not_defined
+Choices=nl_using_brace\s*=\s*ignore|nl_using_brace\s*=\s*add|nl_using_brace\s*=\s*remove|nl_using_brace\s*=\s*force|nl_using_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Using Brace|Add Nl Using Brace|Remove Nl Using Brace|Force Nl Using Brace"
 ValueDefault=ignore
 
@@ -3928,7 +4071,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|nl_brace_brace=not_defined
+Choices=nl_brace_brace\s*=\s*ignore|nl_brace_brace\s*=\s*add|nl_brace_brace\s*=\s*remove|nl_brace_brace\s*=\s*force|nl_brace_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Brace Brace|Add Nl Brace Brace|Remove Nl Brace Brace|Force Nl Brace Brace"
 ValueDefault=ignore
 
@@ -3937,7 +4080,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|nl_do_brace=not_defined
+Choices=nl_do_brace\s*=\s*ignore|nl_do_brace\s*=\s*add|nl_do_brace\s*=\s*remove|nl_do_brace\s*=\s*force|nl_do_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Do Brace|Add Nl Do Brace|Remove Nl Do Brace|Force Nl Do Brace"
 ValueDefault=ignore
 
@@ -3946,7 +4089,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|nl_brace_while=not_defined
+Choices=nl_brace_while\s*=\s*ignore|nl_brace_while\s*=\s*add|nl_brace_while\s*=\s*remove|nl_brace_while\s*=\s*force|nl_brace_while\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Brace While|Add Nl Brace While|Remove Nl Brace While|Force Nl Brace While"
 ValueDefault=ignore
 
@@ -3955,7 +4098,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|nl_switch_brace=not_defined
+Choices=nl_switch_brace\s*=\s*ignore|nl_switch_brace\s*=\s*add|nl_switch_brace\s*=\s*remove|nl_switch_brace\s*=\s*force|nl_switch_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Switch Brace|Add Nl Switch Brace|Remove Nl Switch Brace|Force Nl Switch Brace"
 ValueDefault=ignore
 
@@ -3964,7 +4107,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|nl_synchronized_brace=not_defined
+Choices=nl_synchronized_brace\s*=\s*ignore|nl_synchronized_brace\s*=\s*add|nl_synchronized_brace\s*=\s*remove|nl_synchronized_brace\s*=\s*force|nl_synchronized_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Synchronized Brace|Add Nl Synchronized Brace|Remove Nl Synchronized Brace|Force Nl Synchronized Brace"
 ValueDefault=ignore
 
@@ -3973,7 +4116,7 @@ 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
+TrueFalse=nl_multi_line_cond\s*=\s*true|nl_multi_line_cond\s*=\s*false
 ValueDefault=false
 
 [Nl Multi Line Sparen Open]
@@ -3981,7 +4124,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|nl_multi_line_sparen_open=not_defined
+Choices=nl_multi_line_sparen_open\s*=\s*ignore|nl_multi_line_sparen_open\s*=\s*add|nl_multi_line_sparen_open\s*=\s*remove|nl_multi_line_sparen_open\s*=\s*force|nl_multi_line_sparen_open\s*=\s*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
 
@@ -3990,7 +4133,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|nl_multi_line_sparen_close=not_defined
+Choices=nl_multi_line_sparen_close\s*=\s*ignore|nl_multi_line_sparen_close\s*=\s*add|nl_multi_line_sparen_close\s*=\s*remove|nl_multi_line_sparen_close\s*=\s*force|nl_multi_line_sparen_close\s*=\s*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
 
@@ -3999,7 +4142,7 @@ 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
+TrueFalse=nl_multi_line_define\s*=\s*true|nl_multi_line_define\s*=\s*false
 ValueDefault=false
 
 [Nl Before Case]
@@ -4007,7 +4150,7 @@ 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
+TrueFalse=nl_before_case\s*=\s*true|nl_before_case\s*=\s*false
 ValueDefault=false
 
 [Nl After Case]
@@ -4015,7 +4158,7 @@ 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
+TrueFalse=nl_after_case\s*=\s*true|nl_after_case\s*=\s*false
 ValueDefault=false
 
 [Nl Case Colon Brace]
@@ -4023,7 +4166,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|nl_case_colon_brace=not_defined
+Choices=nl_case_colon_brace\s*=\s*ignore|nl_case_colon_brace\s*=\s*add|nl_case_colon_brace\s*=\s*remove|nl_case_colon_brace\s*=\s*force|nl_case_colon_brace\s*=\s*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
 
@@ -4032,7 +4175,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|nl_before_throw=not_defined
+Choices=nl_before_throw\s*=\s*ignore|nl_before_throw\s*=\s*add|nl_before_throw\s*=\s*remove|nl_before_throw\s*=\s*force|nl_before_throw\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Before Throw|Add Nl Before Throw|Remove Nl Before Throw|Force Nl Before Throw"
 ValueDefault=ignore
 
@@ -4041,7 +4184,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|nl_namespace_brace=not_defined
+Choices=nl_namespace_brace\s*=\s*ignore|nl_namespace_brace\s*=\s*add|nl_namespace_brace\s*=\s*remove|nl_namespace_brace\s*=\s*force|nl_namespace_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Namespace Brace|Add Nl Namespace Brace|Remove Nl Namespace Brace|Force Nl Namespace Brace"
 ValueDefault=ignore
 
@@ -4050,7 +4193,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|nl_template_class=not_defined
+Choices=nl_template_class\s*=\s*ignore|nl_template_class\s*=\s*add|nl_template_class\s*=\s*remove|nl_template_class\s*=\s*force|nl_template_class\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Template Class|Add Nl Template Class|Remove Nl Template Class|Force Nl Template Class"
 ValueDefault=ignore
 
@@ -4059,7 +4202,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|nl_template_class_decl=not_defined
+Choices=nl_template_class_decl\s*=\s*ignore|nl_template_class_decl\s*=\s*add|nl_template_class_decl\s*=\s*remove|nl_template_class_decl\s*=\s*force|nl_template_class_decl\s*=\s*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
 
@@ -4068,7 +4211,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|nl_template_class_decl_special=not_defined
+Choices=nl_template_class_decl_special\s*=\s*ignore|nl_template_class_decl_special\s*=\s*add|nl_template_class_decl_special\s*=\s*remove|nl_template_class_decl_special\s*=\s*force|nl_template_class_decl_special\s*=\s*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
 
@@ -4077,7 +4220,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|nl_template_class_def=not_defined
+Choices=nl_template_class_def\s*=\s*ignore|nl_template_class_def\s*=\s*add|nl_template_class_def\s*=\s*remove|nl_template_class_def\s*=\s*force|nl_template_class_def\s*=\s*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
 
@@ -4086,7 +4229,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|nl_template_class_def_special=not_defined
+Choices=nl_template_class_def_special\s*=\s*ignore|nl_template_class_def_special\s*=\s*add|nl_template_class_def_special\s*=\s*remove|nl_template_class_def_special\s*=\s*force|nl_template_class_def_special\s*=\s*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
 
@@ -4095,7 +4238,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|nl_template_func=not_defined
+Choices=nl_template_func\s*=\s*ignore|nl_template_func\s*=\s*add|nl_template_func\s*=\s*remove|nl_template_func\s*=\s*force|nl_template_func\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Template Func|Add Nl Template Func|Remove Nl Template Func|Force Nl Template Func"
 ValueDefault=ignore
 
@@ -4104,7 +4247,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|nl_template_func_decl=not_defined
+Choices=nl_template_func_decl\s*=\s*ignore|nl_template_func_decl\s*=\s*add|nl_template_func_decl\s*=\s*remove|nl_template_func_decl\s*=\s*force|nl_template_func_decl\s*=\s*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
 
@@ -4113,7 +4256,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|nl_template_func_decl_special=not_defined
+Choices=nl_template_func_decl_special\s*=\s*ignore|nl_template_func_decl_special\s*=\s*add|nl_template_func_decl_special\s*=\s*remove|nl_template_func_decl_special\s*=\s*force|nl_template_func_decl_special\s*=\s*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
 
@@ -4122,7 +4265,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|nl_template_func_def=not_defined
+Choices=nl_template_func_def\s*=\s*ignore|nl_template_func_def\s*=\s*add|nl_template_func_def\s*=\s*remove|nl_template_func_def\s*=\s*force|nl_template_func_def\s*=\s*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
 
@@ -4131,7 +4274,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|nl_template_func_def_special=not_defined
+Choices=nl_template_func_def_special\s*=\s*ignore|nl_template_func_def_special\s*=\s*add|nl_template_func_def_special\s*=\s*remove|nl_template_func_def_special\s*=\s*force|nl_template_func_def_special\s*=\s*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
 
@@ -4140,7 +4283,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|nl_template_var=not_defined
+Choices=nl_template_var\s*=\s*ignore|nl_template_var\s*=\s*add|nl_template_var\s*=\s*remove|nl_template_var\s*=\s*force|nl_template_var\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Template Var|Add Nl Template Var|Remove Nl Template Var|Force Nl Template Var"
 ValueDefault=ignore
 
@@ -4149,7 +4292,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|nl_template_using=not_defined
+Choices=nl_template_using\s*=\s*ignore|nl_template_using\s*=\s*add|nl_template_using\s*=\s*remove|nl_template_using\s*=\s*force|nl_template_using\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Template Using|Add Nl Template Using|Remove Nl Template Using|Force Nl Template Using"
 ValueDefault=ignore
 
@@ -4158,7 +4301,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|nl_class_brace=not_defined
+Choices=nl_class_brace\s*=\s*ignore|nl_class_brace\s*=\s*add|nl_class_brace\s*=\s*remove|nl_class_brace\s*=\s*force|nl_class_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Class Brace|Add Nl Class Brace|Remove Nl Class Brace|Force Nl Class Brace"
 ValueDefault=ignore
 
@@ -4167,7 +4310,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|nl_class_init_args=not_defined
+Choices=nl_class_init_args\s*=\s*ignore|nl_class_init_args\s*=\s*add|nl_class_init_args\s*=\s*remove|nl_class_init_args\s*=\s*force|nl_class_init_args\s*=\s*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
 
@@ -4176,7 +4319,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|nl_constr_init_args=not_defined
+Choices=nl_constr_init_args\s*=\s*ignore|nl_constr_init_args\s*=\s*add|nl_constr_init_args\s*=\s*remove|nl_constr_init_args\s*=\s*force|nl_constr_init_args\s*=\s*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
 
@@ -4185,7 +4328,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|nl_enum_own_lines=not_defined
+Choices=nl_enum_own_lines\s*=\s*ignore|nl_enum_own_lines\s*=\s*add|nl_enum_own_lines\s*=\s*remove|nl_enum_own_lines\s*=\s*force|nl_enum_own_lines\s*=\s*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
 
@@ -4194,7 +4337,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|nl_func_type_name=not_defined
+Choices=nl_func_type_name\s*=\s*ignore|nl_func_type_name\s*=\s*add|nl_func_type_name\s*=\s*remove|nl_func_type_name\s*=\s*force|nl_func_type_name\s*=\s*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
 
@@ -4203,7 +4346,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|nl_func_type_name_class=not_defined
+Choices=nl_func_type_name_class\s*=\s*ignore|nl_func_type_name_class\s*=\s*add|nl_func_type_name_class\s*=\s*remove|nl_func_type_name_class\s*=\s*force|nl_func_type_name_class\s*=\s*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
 
@@ -4212,7 +4355,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|nl_func_class_scope=not_defined
+Choices=nl_func_class_scope\s*=\s*ignore|nl_func_class_scope\s*=\s*add|nl_func_class_scope\s*=\s*remove|nl_func_class_scope\s*=\s*force|nl_func_class_scope\s*=\s*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
 
@@ -4221,7 +4364,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|nl_func_scope_name=not_defined
+Choices=nl_func_scope_name\s*=\s*ignore|nl_func_scope_name\s*=\s*add|nl_func_scope_name\s*=\s*remove|nl_func_scope_name\s*=\s*force|nl_func_scope_name\s*=\s*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
 
@@ -4230,7 +4373,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|nl_func_proto_type_name=not_defined
+Choices=nl_func_proto_type_name\s*=\s*ignore|nl_func_proto_type_name\s*=\s*add|nl_func_proto_type_name\s*=\s*remove|nl_func_proto_type_name\s*=\s*force|nl_func_proto_type_name\s*=\s*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
 
@@ -4239,7 +4382,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|nl_func_paren=not_defined
+Choices=nl_func_paren\s*=\s*ignore|nl_func_paren\s*=\s*add|nl_func_paren\s*=\s*remove|nl_func_paren\s*=\s*force|nl_func_paren\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Func Paren|Add Nl Func Paren|Remove Nl Func Paren|Force Nl Func Paren"
 ValueDefault=ignore
 
@@ -4248,7 +4391,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|nl_func_paren_empty=not_defined
+Choices=nl_func_paren_empty\s*=\s*ignore|nl_func_paren_empty\s*=\s*add|nl_func_paren_empty\s*=\s*remove|nl_func_paren_empty\s*=\s*force|nl_func_paren_empty\s*=\s*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
 
@@ -4257,7 +4400,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|nl_func_def_paren=not_defined
+Choices=nl_func_def_paren\s*=\s*ignore|nl_func_def_paren\s*=\s*add|nl_func_def_paren\s*=\s*remove|nl_func_def_paren\s*=\s*force|nl_func_def_paren\s*=\s*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
 
@@ -4266,7 +4409,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|nl_func_def_paren_empty=not_defined
+Choices=nl_func_def_paren_empty\s*=\s*ignore|nl_func_def_paren_empty\s*=\s*add|nl_func_def_paren_empty\s*=\s*remove|nl_func_def_paren_empty\s*=\s*force|nl_func_def_paren_empty\s*=\s*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
 
@@ -4275,7 +4418,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|nl_func_call_paren=not_defined
+Choices=nl_func_call_paren\s*=\s*ignore|nl_func_call_paren\s*=\s*add|nl_func_call_paren\s*=\s*remove|nl_func_call_paren\s*=\s*force|nl_func_call_paren\s*=\s*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
 
@@ -4284,7 +4427,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|nl_func_call_paren_empty=not_defined
+Choices=nl_func_call_paren_empty\s*=\s*ignore|nl_func_call_paren_empty\s*=\s*add|nl_func_call_paren_empty\s*=\s*remove|nl_func_call_paren_empty\s*=\s*force|nl_func_call_paren_empty\s*=\s*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
 
@@ -4293,7 +4436,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|nl_func_decl_start=not_defined
+Choices=nl_func_decl_start\s*=\s*ignore|nl_func_decl_start\s*=\s*add|nl_func_decl_start\s*=\s*remove|nl_func_decl_start\s*=\s*force|nl_func_decl_start\s*=\s*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
 
@@ -4302,7 +4445,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|nl_func_def_start=not_defined
+Choices=nl_func_def_start\s*=\s*ignore|nl_func_def_start\s*=\s*add|nl_func_def_start\s*=\s*remove|nl_func_def_start\s*=\s*force|nl_func_def_start\s*=\s*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
 
@@ -4311,7 +4454,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|nl_func_decl_start_single=not_defined
+Choices=nl_func_decl_start_single\s*=\s*ignore|nl_func_decl_start_single\s*=\s*add|nl_func_decl_start_single\s*=\s*remove|nl_func_decl_start_single\s*=\s*force|nl_func_decl_start_single\s*=\s*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
 
@@ -4320,7 +4463,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|nl_func_def_start_single=not_defined
+Choices=nl_func_def_start_single\s*=\s*ignore|nl_func_def_start_single\s*=\s*add|nl_func_def_start_single\s*=\s*remove|nl_func_def_start_single\s*=\s*force|nl_func_def_start_single\s*=\s*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
 
@@ -4329,7 +4472,7 @@ 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
+TrueFalse=nl_func_decl_start_multi_line\s*=\s*true|nl_func_decl_start_multi_line\s*=\s*false
 ValueDefault=false
 
 [Nl Func Def Start Multi Line]
@@ -4337,7 +4480,7 @@ 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
+TrueFalse=nl_func_def_start_multi_line\s*=\s*true|nl_func_def_start_multi_line\s*=\s*false
 ValueDefault=false
 
 [Nl Func Decl Args]
@@ -4345,7 +4488,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|nl_func_decl_args=not_defined
+Choices=nl_func_decl_args\s*=\s*ignore|nl_func_decl_args\s*=\s*add|nl_func_decl_args\s*=\s*remove|nl_func_decl_args\s*=\s*force|nl_func_decl_args\s*=\s*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
 
@@ -4354,7 +4497,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|nl_func_def_args=not_defined
+Choices=nl_func_def_args\s*=\s*ignore|nl_func_def_args\s*=\s*add|nl_func_def_args\s*=\s*remove|nl_func_def_args\s*=\s*force|nl_func_def_args\s*=\s*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
 
@@ -4363,7 +4506,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|nl_func_call_args=not_defined
+Choices=nl_func_call_args\s*=\s*ignore|nl_func_call_args\s*=\s*add|nl_func_call_args\s*=\s*remove|nl_func_call_args\s*=\s*force|nl_func_call_args\s*=\s*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
 
@@ -4372,7 +4515,7 @@ 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
+TrueFalse=nl_func_decl_args_multi_line\s*=\s*true|nl_func_decl_args_multi_line\s*=\s*false
 ValueDefault=false
 
 [Nl Func Def Args Multi Line]
@@ -4380,7 +4523,7 @@ 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
+TrueFalse=nl_func_def_args_multi_line\s*=\s*true|nl_func_def_args_multi_line\s*=\s*false
 ValueDefault=false
 
 [Nl Func Decl End]
@@ -4388,7 +4531,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|nl_func_decl_end=not_defined
+Choices=nl_func_decl_end\s*=\s*ignore|nl_func_decl_end\s*=\s*add|nl_func_decl_end\s*=\s*remove|nl_func_decl_end\s*=\s*force|nl_func_decl_end\s*=\s*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
 
@@ -4397,7 +4540,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|nl_func_def_end=not_defined
+Choices=nl_func_def_end\s*=\s*ignore|nl_func_def_end\s*=\s*add|nl_func_def_end\s*=\s*remove|nl_func_def_end\s*=\s*force|nl_func_def_end\s*=\s*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
 
@@ -4406,7 +4549,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|nl_func_decl_end_single=not_defined
+Choices=nl_func_decl_end_single\s*=\s*ignore|nl_func_decl_end_single\s*=\s*add|nl_func_decl_end_single\s*=\s*remove|nl_func_decl_end_single\s*=\s*force|nl_func_decl_end_single\s*=\s*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
 
@@ -4415,7 +4558,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|nl_func_def_end_single=not_defined
+Choices=nl_func_def_end_single\s*=\s*ignore|nl_func_def_end_single\s*=\s*add|nl_func_def_end_single\s*=\s*remove|nl_func_def_end_single\s*=\s*force|nl_func_def_end_single\s*=\s*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
 
@@ -4424,7 +4567,7 @@ 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
+TrueFalse=nl_func_decl_end_multi_line\s*=\s*true|nl_func_decl_end_multi_line\s*=\s*false
 ValueDefault=false
 
 [Nl Func Def End Multi Line]
@@ -4432,7 +4575,7 @@ 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
+TrueFalse=nl_func_def_end_multi_line\s*=\s*true|nl_func_def_end_multi_line\s*=\s*false
 ValueDefault=false
 
 [Nl Func Decl Empty]
@@ -4440,7 +4583,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|nl_func_decl_empty=not_defined
+Choices=nl_func_decl_empty\s*=\s*ignore|nl_func_decl_empty\s*=\s*add|nl_func_decl_empty\s*=\s*remove|nl_func_decl_empty\s*=\s*force|nl_func_decl_empty\s*=\s*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
 
@@ -4449,7 +4592,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|nl_func_def_empty=not_defined
+Choices=nl_func_def_empty\s*=\s*ignore|nl_func_def_empty\s*=\s*add|nl_func_def_empty\s*=\s*remove|nl_func_def_empty\s*=\s*force|nl_func_def_empty\s*=\s*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
 
@@ -4458,7 +4601,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|nl_func_call_empty=not_defined
+Choices=nl_func_call_empty\s*=\s*ignore|nl_func_call_empty\s*=\s*add|nl_func_call_empty\s*=\s*remove|nl_func_call_empty\s*=\s*force|nl_func_call_empty\s*=\s*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
 
@@ -4467,7 +4610,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|nl_func_call_start=not_defined
+Choices=nl_func_call_start\s*=\s*ignore|nl_func_call_start\s*=\s*add|nl_func_call_start\s*=\s*remove|nl_func_call_start\s*=\s*force|nl_func_call_start\s*=\s*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
 
@@ -4476,7 +4619,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|nl_func_call_end=not_defined
+Choices=nl_func_call_end\s*=\s*ignore|nl_func_call_end\s*=\s*add|nl_func_call_end\s*=\s*remove|nl_func_call_end\s*=\s*force|nl_func_call_end\s*=\s*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
 
@@ -4485,7 +4628,7 @@ 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
+TrueFalse=nl_func_call_start_multi_line\s*=\s*true|nl_func_call_start_multi_line\s*=\s*false
 ValueDefault=false
 
 [Nl Func Call Args Multi Line]
@@ -4493,7 +4636,7 @@ 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
+TrueFalse=nl_func_call_args_multi_line\s*=\s*true|nl_func_call_args_multi_line\s*=\s*false
 ValueDefault=false
 
 [Nl Func Call End Multi Line]
@@ -4501,7 +4644,7 @@ 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
+TrueFalse=nl_func_call_end_multi_line\s*=\s*true|nl_func_call_end_multi_line\s*=\s*false
 ValueDefault=false
 
 [Nl Func Call Args Multi Line Ignore Closures]
@@ -4509,7 +4652,7 @@ 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
+TrueFalse=nl_func_call_args_multi_line_ignore_closures\s*=\s*true|nl_func_call_args_multi_line_ignore_closures\s*=\s*false
 ValueDefault=false
 
 [Nl Template Start]
@@ -4517,7 +4660,7 @@ 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
+TrueFalse=nl_template_start\s*=\s*true|nl_template_start\s*=\s*false
 ValueDefault=false
 
 [Nl Template Args]
@@ -4525,7 +4668,7 @@ 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
+TrueFalse=nl_template_args\s*=\s*true|nl_template_args\s*=\s*false
 ValueDefault=false
 
 [Nl Template End]
@@ -4533,7 +4676,7 @@ 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
+TrueFalse=nl_template_end\s*=\s*true|nl_template_end\s*=\s*false
 ValueDefault=false
 
 [Nl Oc Msg Args]
@@ -4541,7 +4684,7 @@ 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
+TrueFalse=nl_oc_msg_args\s*=\s*true|nl_oc_msg_args\s*=\s*false
 ValueDefault=false
 
 [Nl Oc Msg Args Min Params]
@@ -4549,7 +4692,7 @@ Category=3
 Description="<html>(OC) Minimum number of Objective-C message parameters before applying nl_oc_msg_args.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_oc_msg_args_min_params="
+CallName="nl_oc_msg_args_min_params\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -4559,7 +4702,7 @@ Category=3
 Description="<html>(OC) Max code width of Objective-C message before applying nl_oc_msg_args.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_oc_msg_args_max_code_width="
+CallName="nl_oc_msg_args_max_code_width\s*=\s*"
 MinVal=0
 MaxVal=10000
 ValueDefault=0
@@ -4569,7 +4712,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|nl_fdef_brace=not_defined
+Choices=nl_fdef_brace\s*=\s*ignore|nl_fdef_brace\s*=\s*add|nl_fdef_brace\s*=\s*remove|nl_fdef_brace\s*=\s*force|nl_fdef_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Fdef Brace|Add Nl Fdef Brace|Remove Nl Fdef Brace|Force Nl Fdef Brace"
 ValueDefault=ignore
 
@@ -4578,7 +4721,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|nl_fdef_brace_cond=not_defined
+Choices=nl_fdef_brace_cond\s*=\s*ignore|nl_fdef_brace_cond\s*=\s*add|nl_fdef_brace_cond\s*=\s*remove|nl_fdef_brace_cond\s*=\s*force|nl_fdef_brace_cond\s*=\s*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
 
@@ -4587,7 +4730,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|nl_cpp_ldef_brace=not_defined
+Choices=nl_cpp_ldef_brace\s*=\s*ignore|nl_cpp_ldef_brace\s*=\s*add|nl_cpp_ldef_brace\s*=\s*remove|nl_cpp_ldef_brace\s*=\s*force|nl_cpp_ldef_brace\s*=\s*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
 
@@ -4596,7 +4739,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|nl_return_expr=not_defined
+Choices=nl_return_expr\s*=\s*ignore|nl_return_expr\s*=\s*add|nl_return_expr\s*=\s*remove|nl_return_expr\s*=\s*force|nl_return_expr\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Return Expr|Add Nl Return Expr|Remove Nl Return Expr|Force Nl Return Expr"
 ValueDefault=ignore
 
@@ -4605,7 +4748,7 @@ Category=3
 Description="<html>Add or remove newline between 'throw' and the throw expression.</html>"
 Enabled=false
 EditorType=multiple
-Choices=nl_throw_expr=ignore|nl_throw_expr=add|nl_throw_expr=remove|nl_throw_expr=force|nl_throw_expr=not_defined
+Choices=nl_throw_expr\s*=\s*ignore|nl_throw_expr\s*=\s*add|nl_throw_expr\s*=\s*remove|nl_throw_expr\s*=\s*force|nl_throw_expr\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Throw Expr|Add Nl Throw Expr|Remove Nl Throw Expr|Force Nl Throw Expr"
 ValueDefault=ignore
 
@@ -4614,7 +4757,7 @@ 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
+TrueFalse=nl_after_semicolon\s*=\s*true|nl_after_semicolon\s*=\s*false
 ValueDefault=false
 
 [Nl Paren Dbrace Open]
@@ -4622,7 +4765,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|nl_paren_dbrace_open=not_defined
+Choices=nl_paren_dbrace_open\s*=\s*ignore|nl_paren_dbrace_open\s*=\s*add|nl_paren_dbrace_open\s*=\s*remove|nl_paren_dbrace_open\s*=\s*force|nl_paren_dbrace_open\s*=\s*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
 
@@ -4631,7 +4774,7 @@ Category=3
 Description="<html>Whether to add a newline after the type in an unnamed temporary<br/>direct-list-initialization, better:<br/>before a 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
+Choices=nl_type_brace_init_lst\s*=\s*ignore|nl_type_brace_init_lst\s*=\s*add|nl_type_brace_init_lst\s*=\s*remove|nl_type_brace_init_lst\s*=\s*force|nl_type_brace_init_lst\s*=\s*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
 
@@ -4640,7 +4783,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|nl_type_brace_init_lst_open=not_defined
+Choices=nl_type_brace_init_lst_open\s*=\s*ignore|nl_type_brace_init_lst_open\s*=\s*add|nl_type_brace_init_lst_open\s*=\s*remove|nl_type_brace_init_lst_open\s*=\s*force|nl_type_brace_init_lst_open\s*=\s*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
 
@@ -4649,7 +4792,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|nl_type_brace_init_lst_close=not_defined
+Choices=nl_type_brace_init_lst_close\s*=\s*ignore|nl_type_brace_init_lst_close\s*=\s*add|nl_type_brace_init_lst_close\s*=\s*remove|nl_type_brace_init_lst_close\s*=\s*force|nl_type_brace_init_lst_close\s*=\s*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
 
@@ -4658,7 +4801,7 @@ Category=3
 Description="<html>Whether to add a newline before '{'.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=nl_before_brace_open=true|nl_before_brace_open=false
+TrueFalse=nl_before_brace_open\s*=\s*true|nl_before_brace_open\s*=\s*false
 ValueDefault=false
 
 [Nl After Brace Open]
@@ -4666,7 +4809,7 @@ Category=3
 Description="<html>Whether to add a newline after '{'.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=nl_after_brace_open=true|nl_after_brace_open=false
+TrueFalse=nl_after_brace_open\s*=\s*true|nl_after_brace_open\s*=\s*false
 ValueDefault=false
 
 [Nl After Brace Open Cmt]
@@ -4674,7 +4817,7 @@ 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
+TrueFalse=nl_after_brace_open_cmt\s*=\s*true|nl_after_brace_open_cmt\s*=\s*false
 ValueDefault=false
 
 [Nl After Vbrace Open]
@@ -4682,7 +4825,7 @@ 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
+TrueFalse=nl_after_vbrace_open\s*=\s*true|nl_after_vbrace_open\s*=\s*false
 ValueDefault=false
 
 [Nl After Vbrace Open Empty]
@@ -4690,7 +4833,7 @@ 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
+TrueFalse=nl_after_vbrace_open_empty\s*=\s*true|nl_after_vbrace_open_empty\s*=\s*false
 ValueDefault=false
 
 [Nl After Brace Close]
@@ -4698,7 +4841,7 @@ 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
+TrueFalse=nl_after_brace_close\s*=\s*true|nl_after_brace_close\s*=\s*false
 ValueDefault=false
 
 [Nl After Vbrace Close]
@@ -4706,7 +4849,7 @@ 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
+TrueFalse=nl_after_vbrace_close\s*=\s*true|nl_after_vbrace_close\s*=\s*false
 ValueDefault=false
 
 [Nl Brace Struct Var]
@@ -4714,7 +4857,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|nl_brace_struct_var=not_defined
+Choices=nl_brace_struct_var\s*=\s*ignore|nl_brace_struct_var\s*=\s*add|nl_brace_struct_var\s*=\s*remove|nl_brace_struct_var\s*=\s*force|nl_brace_struct_var\s*=\s*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
 
@@ -4723,7 +4866,7 @@ 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
+TrueFalse=nl_define_macro\s*=\s*true|nl_define_macro\s*=\s*false
 ValueDefault=false
 
 [Nl Squeeze Paren Close]
@@ -4731,7 +4874,7 @@ 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
+TrueFalse=nl_squeeze_paren_close\s*=\s*true|nl_squeeze_paren_close\s*=\s*false
 ValueDefault=false
 
 [Nl Squeeze Ifdef]
@@ -4739,7 +4882,7 @@ 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
+TrueFalse=nl_squeeze_ifdef\s*=\s*true|nl_squeeze_ifdef\s*=\s*false
 ValueDefault=false
 
 [Nl Squeeze Ifdef Top Level]
@@ -4747,7 +4890,7 @@ 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
+TrueFalse=nl_squeeze_ifdef_top_level\s*=\s*true|nl_squeeze_ifdef_top_level\s*=\s*false
 ValueDefault=false
 
 [Nl Before If]
@@ -4755,7 +4898,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|nl_before_if=not_defined
+Choices=nl_before_if\s*=\s*ignore|nl_before_if\s*=\s*add|nl_before_if\s*=\s*remove|nl_before_if\s*=\s*force|nl_before_if\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Before If|Add Nl Before If|Remove Nl Before If|Force Nl Before If"
 ValueDefault=ignore
 
@@ -4764,7 +4907,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|nl_after_if=not_defined
+Choices=nl_after_if\s*=\s*ignore|nl_after_if\s*=\s*add|nl_after_if\s*=\s*remove|nl_after_if\s*=\s*force|nl_after_if\s*=\s*not_defined
 ChoicesReadable="Ignore Nl After If|Add Nl After If|Remove Nl After If|Force Nl After If"
 ValueDefault=ignore
 
@@ -4773,7 +4916,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|nl_before_for=not_defined
+Choices=nl_before_for\s*=\s*ignore|nl_before_for\s*=\s*add|nl_before_for\s*=\s*remove|nl_before_for\s*=\s*force|nl_before_for\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Before For|Add Nl Before For|Remove Nl Before For|Force Nl Before For"
 ValueDefault=ignore
 
@@ -4782,7 +4925,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|nl_after_for=not_defined
+Choices=nl_after_for\s*=\s*ignore|nl_after_for\s*=\s*add|nl_after_for\s*=\s*remove|nl_after_for\s*=\s*force|nl_after_for\s*=\s*not_defined
 ChoicesReadable="Ignore Nl After For|Add Nl After For|Remove Nl After For|Force Nl After For"
 ValueDefault=ignore
 
@@ -4791,7 +4934,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|nl_before_while=not_defined
+Choices=nl_before_while\s*=\s*ignore|nl_before_while\s*=\s*add|nl_before_while\s*=\s*remove|nl_before_while\s*=\s*force|nl_before_while\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Before While|Add Nl Before While|Remove Nl Before While|Force Nl Before While"
 ValueDefault=ignore
 
@@ -4800,7 +4943,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|nl_after_while=not_defined
+Choices=nl_after_while\s*=\s*ignore|nl_after_while\s*=\s*add|nl_after_while\s*=\s*remove|nl_after_while\s*=\s*force|nl_after_while\s*=\s*not_defined
 ChoicesReadable="Ignore Nl After While|Add Nl After While|Remove Nl After While|Force Nl After While"
 ValueDefault=ignore
 
@@ -4809,7 +4952,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|nl_before_switch=not_defined
+Choices=nl_before_switch\s*=\s*ignore|nl_before_switch\s*=\s*add|nl_before_switch\s*=\s*remove|nl_before_switch\s*=\s*force|nl_before_switch\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Before Switch|Add Nl Before Switch|Remove Nl Before Switch|Force Nl Before Switch"
 ValueDefault=ignore
 
@@ -4818,7 +4961,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|nl_after_switch=not_defined
+Choices=nl_after_switch\s*=\s*ignore|nl_after_switch\s*=\s*add|nl_after_switch\s*=\s*remove|nl_after_switch\s*=\s*force|nl_after_switch\s*=\s*not_defined
 ChoicesReadable="Ignore Nl After Switch|Add Nl After Switch|Remove Nl After Switch|Force Nl After Switch"
 ValueDefault=ignore
 
@@ -4827,7 +4970,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|nl_before_synchronized=not_defined
+Choices=nl_before_synchronized\s*=\s*ignore|nl_before_synchronized\s*=\s*add|nl_before_synchronized\s*=\s*remove|nl_before_synchronized\s*=\s*force|nl_before_synchronized\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Before Synchronized|Add Nl Before Synchronized|Remove Nl Before Synchronized|Force Nl Before Synchronized"
 ValueDefault=ignore
 
@@ -4836,7 +4979,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|nl_after_synchronized=not_defined
+Choices=nl_after_synchronized\s*=\s*ignore|nl_after_synchronized\s*=\s*add|nl_after_synchronized\s*=\s*remove|nl_after_synchronized\s*=\s*force|nl_after_synchronized\s*=\s*not_defined
 ChoicesReadable="Ignore Nl After Synchronized|Add Nl After Synchronized|Remove Nl After Synchronized|Force Nl After Synchronized"
 ValueDefault=ignore
 
@@ -4845,7 +4988,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|nl_before_do=not_defined
+Choices=nl_before_do\s*=\s*ignore|nl_before_do\s*=\s*add|nl_before_do\s*=\s*remove|nl_before_do\s*=\s*force|nl_before_do\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Before Do|Add Nl Before Do|Remove Nl Before Do|Force Nl Before Do"
 ValueDefault=ignore
 
@@ -4854,7 +4997,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|nl_after_do=not_defined
+Choices=nl_after_do\s*=\s*ignore|nl_after_do\s*=\s*add|nl_after_do\s*=\s*remove|nl_after_do\s*=\s*force|nl_after_do\s*=\s*not_defined
 ChoicesReadable="Ignore Nl After Do|Add Nl After Do|Remove Nl After Do|Force Nl After Do"
 ValueDefault=ignore
 
@@ -4863,7 +5006,7 @@ Category=3
 Description="<html>Ignore nl_before_{if,for,switch,do,synchronized} if the control<br/>statement is immediately after a case statement.<br/>if nl_before_{if,for,switch,do} is set to remove, this option<br/>does nothing.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=nl_before_ignore_after_case=true|nl_before_ignore_after_case=false
+TrueFalse=nl_before_ignore_after_case\s*=\s*true|nl_before_ignore_after_case\s*=\s*false
 ValueDefault=false
 
 [Nl Before Return]
@@ -4871,7 +5014,7 @@ 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
+TrueFalse=nl_before_return\s*=\s*true|nl_before_return\s*=\s*false
 ValueDefault=false
 
 [Nl After Return]
@@ -4879,7 +5022,7 @@ 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
+TrueFalse=nl_after_return\s*=\s*true|nl_after_return\s*=\s*false
 ValueDefault=false
 
 [Nl Before Member]
@@ -4887,7 +5030,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|nl_before_member=not_defined
+Choices=nl_before_member\s*=\s*ignore|nl_before_member\s*=\s*add|nl_before_member\s*=\s*remove|nl_before_member\s*=\s*force|nl_before_member\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Before Member|Add Nl Before Member|Remove Nl Before Member|Force Nl Before Member"
 ValueDefault=ignore
 
@@ -4896,7 +5039,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|nl_after_member=not_defined
+Choices=nl_after_member\s*=\s*ignore|nl_after_member\s*=\s*add|nl_after_member\s*=\s*remove|nl_after_member\s*=\s*force|nl_after_member\s*=\s*not_defined
 ChoicesReadable="Ignore Nl After Member|Add Nl After Member|Remove Nl After Member|Force Nl After Member"
 ValueDefault=ignore
 
@@ -4905,7 +5048,7 @@ 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
+TrueFalse=nl_ds_struct_enum_cmt\s*=\s*true|nl_ds_struct_enum_cmt\s*=\s*false
 ValueDefault=false
 
 [Nl Ds Struct Enum Close Brace]
@@ -4913,7 +5056,7 @@ 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
+TrueFalse=nl_ds_struct_enum_close_brace\s*=\s*true|nl_ds_struct_enum_close_brace\s*=\s*false
 ValueDefault=false
 
 [Nl Class Colon]
@@ -4921,7 +5064,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|nl_class_colon=not_defined
+Choices=nl_class_colon\s*=\s*ignore|nl_class_colon\s*=\s*add|nl_class_colon\s*=\s*remove|nl_class_colon\s*=\s*force|nl_class_colon\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Class Colon|Add Nl Class Colon|Remove Nl Class Colon|Force Nl Class Colon"
 ValueDefault=ignore
 
@@ -4930,7 +5073,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|nl_constr_colon=not_defined
+Choices=nl_constr_colon\s*=\s*ignore|nl_constr_colon\s*=\s*add|nl_constr_colon\s*=\s*remove|nl_constr_colon\s*=\s*force|nl_constr_colon\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Constr Colon|Add Nl Constr Colon|Remove Nl Constr Colon|Force Nl Constr Colon"
 ValueDefault=ignore
 
@@ -4939,7 +5082,7 @@ 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. If true, it also preserves one-liner namespaces.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=nl_namespace_two_to_one_liner=true|nl_namespace_two_to_one_liner=false
+TrueFalse=nl_namespace_two_to_one_liner\s*=\s*true|nl_namespace_two_to_one_liner\s*=\s*false
 ValueDefault=false
 
 [Nl Create If One Liner]
@@ -4947,7 +5090,7 @@ 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
+TrueFalse=nl_create_if_one_liner\s*=\s*true|nl_create_if_one_liner\s*=\s*false
 ValueDefault=false
 
 [Nl Create For One Liner]
@@ -4955,7 +5098,7 @@ 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
+TrueFalse=nl_create_for_one_liner\s*=\s*true|nl_create_for_one_liner\s*=\s*false
 ValueDefault=false
 
 [Nl Create While One Liner]
@@ -4963,7 +5106,7 @@ 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
+TrueFalse=nl_create_while_one_liner\s*=\s*true|nl_create_while_one_liner\s*=\s*false
 ValueDefault=false
 
 [Nl Create Func Def One Liner]
@@ -4971,7 +5114,7 @@ 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
+TrueFalse=nl_create_func_def_one_liner\s*=\s*true|nl_create_func_def_one_liner\s*=\s*false
 ValueDefault=false
 
 [Nl Create List One Liner]
@@ -4979,7 +5122,7 @@ Category=3
 Description="<html>Whether to split one-line simple list definitions 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
+TrueFalse=nl_create_list_one_liner\s*=\s*true|nl_create_list_one_liner\s*=\s*false
 ValueDefault=false
 
 [Nl Split If One Liner]
@@ -4987,7 +5130,7 @@ 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
+TrueFalse=nl_split_if_one_liner\s*=\s*true|nl_split_if_one_liner\s*=\s*false
 ValueDefault=false
 
 [Nl Split For One Liner]
@@ -4995,7 +5138,7 @@ 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
+TrueFalse=nl_split_for_one_liner\s*=\s*true|nl_split_for_one_liner\s*=\s*false
 ValueDefault=false
 
 [Nl Split While One Liner]
@@ -5003,7 +5146,7 @@ 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
+TrueFalse=nl_split_while_one_liner\s*=\s*true|nl_split_while_one_liner\s*=\s*false
 ValueDefault=false
 
 [Donot Add Nl Before Cpp Comment]
@@ -5011,7 +5154,7 @@ 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
+TrueFalse=donot_add_nl_before_cpp_comment\s*=\s*true|donot_add_nl_before_cpp_comment\s*=\s*false
 ValueDefault=false
 
 [Nl Max]
@@ -5019,7 +5162,7 @@ Category=4
 Description="<html>The maximum number of consecutive newlines (3 = 2 blank lines).</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_max="
+CallName="nl_max\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5029,7 +5172,7 @@ Category=4
 Description="<html>The maximum number of consecutive newlines in a function.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_max_blank_in_func="
+CallName="nl_max_blank_in_func\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5039,7 +5182,7 @@ 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_functions=true</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_inside_empty_func="
+CallName="nl_inside_empty_func\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5049,7 +5192,7 @@ Category=4
 Description="<html>The number of newlines before a function prototype.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_before_func_body_proto="
+CallName="nl_before_func_body_proto\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5059,7 +5202,7 @@ 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="
+CallName="nl_before_func_body_def\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5069,7 +5212,7 @@ 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="
+CallName="nl_before_func_class_proto\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5079,7 +5222,7 @@ 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="
+CallName="nl_before_func_class_def\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5089,7 +5232,7 @@ Category=4
 Description="<html>The number of newlines after a function prototype.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_after_func_proto="
+CallName="nl_after_func_proto\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5099,7 +5242,7 @@ 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="
+CallName="nl_after_func_proto_group\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5109,7 +5252,7 @@ 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="
+CallName="nl_after_func_class_proto\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5119,7 +5262,7 @@ 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="
+CallName="nl_after_func_class_proto_group\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5129,15 +5272,35 @@ 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
+TrueFalse=nl_class_leave_one_liner_groups\s*=\s*true|nl_class_leave_one_liner_groups\s*=\s*false
 ValueDefault=false
 
 [Nl After Func Body]
 Category=4
-Description="<html>The number of newlines after '}' of a multi-line function body.</html>"
+Description="<html>The number of newlines after '}' of a multi-line function body.<br/><br/>Overrides nl_min_after_func_body and nl_max_after_func_body.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_after_func_body="
+CallName="nl_after_func_body\s*=\s*"
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Min After Func Body]
+Category=4
+Description="<html>The minimum number of newlines after '}' of a multi-line function body.<br/><br/>Only works when nl_after_func_body is 0.</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_min_after_func_body\s*=\s*"
+MinVal=0
+MaxVal=16
+ValueDefault=0
+
+[Nl Max After Func Body]
+Category=4
+Description="<html>The maximum number of newlines after '}' of a multi-line function body.<br/><br/>Only works when nl_after_func_body is 0.<br/>Takes precedence over nl_min_after_func_body.</html>"
+Enabled=false
+EditorType=numeric
+CallName="nl_max_after_func_body\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5147,7 +5310,7 @@ 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="
+CallName="nl_after_func_body_class\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5157,7 +5320,7 @@ 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="
+CallName="nl_after_func_body_one_liner\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5167,7 +5330,7 @@ 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="
+CallName="nl_typedef_blk_start\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5177,7 +5340,7 @@ 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="
+CallName="nl_typedef_blk_end\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5187,7 +5350,7 @@ 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="
+CallName="nl_typedef_blk_in\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5197,7 +5360,7 @@ Category=4
 Description="<html>The minimum number of blank lines after a block of variable definitions<br/>at the top of a function body. If any preprocessor directives appear<br/>between the opening brace of the function and the variable block, then<br/>it is considered as not at the top of the function.Newlines are added<br/>before trailing preprocessor directives, if any exist.<br/><br/>0: No change (default).</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_var_def_blk_end_func_top="
+CallName="nl_var_def_blk_end_func_top\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5207,7 +5370,7 @@ Category=4
 Description="<html>The minimum number of empty newlines before a block of variable definitions<br/>not at the top of a function body. If nl_after_access_spec is non-zero,<br/>that option takes precedence. Newlines are not added at the top of the<br/>file or just after an opening brace. Newlines are added above any<br/>preprocessor directives before the block.<br/><br/>0: No change (default).</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_var_def_blk_start="
+CallName="nl_var_def_blk_start\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5217,7 +5380,7 @@ Category=4
 Description="<html>The minimum number of empty newlines after a block of variable definitions<br/>not at the top of a function body. Newlines are not added if the block<br/>is at the bottom of the file or just before a preprocessor directive.<br/><br/>0: No change (default).</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_var_def_blk_end="
+CallName="nl_var_def_blk_end\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5227,7 +5390,7 @@ 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="
+CallName="nl_var_def_blk_in\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5237,7 +5400,7 @@ 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="
+CallName="nl_before_block_comment\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5247,7 +5410,7 @@ 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="
+CallName="nl_before_c_comment\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5257,7 +5420,7 @@ 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="
+CallName="nl_before_cpp_comment\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5267,7 +5430,7 @@ 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
+TrueFalse=nl_after_multiline_comment\s*=\s*true|nl_after_multiline_comment\s*=\s*false
 ValueDefault=false
 
 [Nl After Label Colon]
@@ -5275,7 +5438,7 @@ 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
+TrueFalse=nl_after_label_colon\s*=\s*true|nl_after_label_colon\s*=\s*false
 ValueDefault=false
 
 [Nl Before Struct]
@@ -5283,7 +5446,7 @@ Category=4
 Description="<html>The number of newlines before a struct definition.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_before_struct="
+CallName="nl_before_struct\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5293,7 +5456,7 @@ 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="
+CallName="nl_after_struct\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5303,7 +5466,7 @@ Category=4
 Description="<html>The number of newlines before a class definition.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_before_class="
+CallName="nl_before_class\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5313,7 +5476,7 @@ Category=4
 Description="<html>The number of newlines after '}' or ';' of a class definition.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_after_class="
+CallName="nl_after_class\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5323,7 +5486,7 @@ Category=4
 Description="<html>The number of newlines before a namespace.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_before_namespace="
+CallName="nl_before_namespace\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5333,7 +5496,7 @@ 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="
+CallName="nl_inside_namespace\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5343,7 +5506,7 @@ Category=4
 Description="<html>The number of newlines after '}' of a namespace.</html>"
 Enabled=false
 EditorType=numeric
-CallName="nl_after_namespace="
+CallName="nl_after_namespace\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5353,7 +5516,7 @@ 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="
+CallName="nl_before_access_spec\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5363,7 +5526,7 @@ 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="
+CallName="nl_after_access_spec\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5373,7 +5536,7 @@ 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="
+CallName="nl_comment_func_def\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5383,7 +5546,7 @@ 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="
+CallName="nl_after_try_catch_finally\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5393,7 +5556,7 @@ 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="
+CallName="nl_around_cs_property\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5403,7 +5566,7 @@ 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="
+CallName="nl_between_get_set\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5413,7 +5576,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|nl_property_brace=not_defined
+Choices=nl_property_brace\s*=\s*ignore|nl_property_brace\s*=\s*add|nl_property_brace\s*=\s*remove|nl_property_brace\s*=\s*force|nl_property_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Property Brace|Add Nl Property Brace|Remove Nl Property Brace|Force Nl Property Brace"
 ValueDefault=ignore
 
@@ -5422,7 +5585,7 @@ 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
+TrueFalse=eat_blanks_after_open_brace\s*=\s*true|eat_blanks_after_open_brace\s*=\s*false
 ValueDefault=false
 
 [Eat Blanks Before Close Brace]
@@ -5430,7 +5593,7 @@ 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
+TrueFalse=eat_blanks_before_close_brace\s*=\s*true|eat_blanks_before_close_brace\s*=\s*false
 ValueDefault=false
 
 [Nl Remove Extra Newlines]
@@ -5438,7 +5601,7 @@ 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="
+CallName="nl_remove_extra_newlines\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -5448,7 +5611,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|nl_after_annotation=not_defined
+Choices=nl_after_annotation\s*=\s*ignore|nl_after_annotation\s*=\s*add|nl_after_annotation\s*=\s*remove|nl_after_annotation\s*=\s*force|nl_after_annotation\s*=\s*not_defined
 ChoicesReadable="Ignore Nl After Annotation|Add Nl After Annotation|Remove Nl After Annotation|Force Nl After Annotation"
 ValueDefault=ignore
 
@@ -5457,7 +5620,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|nl_between_annotation=not_defined
+Choices=nl_between_annotation\s*=\s*ignore|nl_between_annotation\s*=\s*add|nl_between_annotation\s*=\s*remove|nl_between_annotation\s*=\s*force|nl_between_annotation\s*=\s*not_defined
 ChoicesReadable="Ignore Nl Between Annotation|Add Nl Between Annotation|Remove Nl Between Annotation|Force Nl Between Annotation"
 ValueDefault=ignore
 
@@ -5466,7 +5629,7 @@ 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="
+CallName="nl_before_whole_file_ifdef\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5476,7 +5639,7 @@ 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="
+CallName="nl_after_whole_file_ifdef\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5486,7 +5649,7 @@ 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="
+CallName="nl_before_whole_file_endif\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5496,7 +5659,7 @@ 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="
+CallName="nl_after_whole_file_endif\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5506,7 +5669,7 @@ Category=5
 Description="<html>The position of arithmetic operators in wrapped expressions.</html>"
 Enabled=false
 EditorType=multiple
-Choices=pos_arith=ignore|pos_arith=break|pos_arith=force|pos_arith=lead|pos_arith=trail|pos_arith=join|pos_arith=lead_break|pos_arith=lead_force|pos_arith=trail_break|pos_arith=trail_force
+Choices=pos_arith\s*=\s*ignore|pos_arith\s*=\s*break|pos_arith\s*=\s*force|pos_arith\s*=\s*lead|pos_arith\s*=\s*trail|pos_arith\s*=\s*join|pos_arith\s*=\s*lead_break|pos_arith\s*=\s*lead_force|pos_arith\s*=\s*trail_break|pos_arith\s*=\s*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
 
@@ -5515,7 +5678,7 @@ 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
+Choices=pos_assign\s*=\s*ignore|pos_assign\s*=\s*break|pos_assign\s*=\s*force|pos_assign\s*=\s*lead|pos_assign\s*=\s*trail|pos_assign\s*=\s*join|pos_assign\s*=\s*lead_break|pos_assign\s*=\s*lead_force|pos_assign\s*=\s*trail_break|pos_assign\s*=\s*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
 
@@ -5524,7 +5687,7 @@ 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
+Choices=pos_bool\s*=\s*ignore|pos_bool\s*=\s*break|pos_bool\s*=\s*force|pos_bool\s*=\s*lead|pos_bool\s*=\s*trail|pos_bool\s*=\s*join|pos_bool\s*=\s*lead_break|pos_bool\s*=\s*lead_force|pos_bool\s*=\s*trail_break|pos_bool\s*=\s*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
 
@@ -5533,7 +5696,7 @@ Category=5
 Description="<html>The position of comparison operators in wrapped expressions.</html>"
 Enabled=false
 EditorType=multiple
-Choices=pos_compare=ignore|pos_compare=break|pos_compare=force|pos_compare=lead|pos_compare=trail|pos_compare=join|pos_compare=lead_break|pos_compare=lead_force|pos_compare=trail_break|pos_compare=trail_force
+Choices=pos_compare\s*=\s*ignore|pos_compare\s*=\s*break|pos_compare\s*=\s*force|pos_compare\s*=\s*lead|pos_compare\s*=\s*trail|pos_compare\s*=\s*join|pos_compare\s*=\s*lead_break|pos_compare\s*=\s*lead_force|pos_compare\s*=\s*trail_break|pos_compare\s*=\s*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
 
@@ -5542,7 +5705,7 @@ 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
+Choices=pos_conditional\s*=\s*ignore|pos_conditional\s*=\s*break|pos_conditional\s*=\s*force|pos_conditional\s*=\s*lead|pos_conditional\s*=\s*trail|pos_conditional\s*=\s*join|pos_conditional\s*=\s*lead_break|pos_conditional\s*=\s*lead_force|pos_conditional\s*=\s*trail_break|pos_conditional\s*=\s*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
 
@@ -5551,7 +5714,7 @@ Category=5
 Description="<html>The position of the comma in wrapped expressions.</html>"
 Enabled=false
 EditorType=multiple
-Choices=pos_comma=ignore|pos_comma=break|pos_comma=force|pos_comma=lead|pos_comma=trail|pos_comma=join|pos_comma=lead_break|pos_comma=lead_force|pos_comma=trail_break|pos_comma=trail_force
+Choices=pos_comma\s*=\s*ignore|pos_comma\s*=\s*break|pos_comma\s*=\s*force|pos_comma\s*=\s*lead|pos_comma\s*=\s*trail|pos_comma\s*=\s*join|pos_comma\s*=\s*lead_break|pos_comma\s*=\s*lead_force|pos_comma\s*=\s*trail_break|pos_comma\s*=\s*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
 
@@ -5560,7 +5723,7 @@ Category=5
 Description="<html>The position of the comma in enum entries.</html>"
 Enabled=false
 EditorType=multiple
-Choices=pos_enum_comma=ignore|pos_enum_comma=break|pos_enum_comma=force|pos_enum_comma=lead|pos_enum_comma=trail|pos_enum_comma=join|pos_enum_comma=lead_break|pos_enum_comma=lead_force|pos_enum_comma=trail_break|pos_enum_comma=trail_force
+Choices=pos_enum_comma\s*=\s*ignore|pos_enum_comma\s*=\s*break|pos_enum_comma\s*=\s*force|pos_enum_comma\s*=\s*lead|pos_enum_comma\s*=\s*trail|pos_enum_comma\s*=\s*join|pos_enum_comma\s*=\s*lead_break|pos_enum_comma\s*=\s*lead_force|pos_enum_comma\s*=\s*trail_break|pos_enum_comma\s*=\s*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
 
@@ -5569,7 +5732,7 @@ 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
+Choices=pos_class_comma\s*=\s*ignore|pos_class_comma\s*=\s*break|pos_class_comma\s*=\s*force|pos_class_comma\s*=\s*lead|pos_class_comma\s*=\s*trail|pos_class_comma\s*=\s*join|pos_class_comma\s*=\s*lead_break|pos_class_comma\s*=\s*lead_force|pos_class_comma\s*=\s*trail_break|pos_class_comma\s*=\s*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
 
@@ -5578,7 +5741,7 @@ 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
+Choices=pos_constr_comma\s*=\s*ignore|pos_constr_comma\s*=\s*break|pos_constr_comma\s*=\s*force|pos_constr_comma\s*=\s*lead|pos_constr_comma\s*=\s*trail|pos_constr_comma\s*=\s*join|pos_constr_comma\s*=\s*lead_break|pos_constr_comma\s*=\s*lead_force|pos_constr_comma\s*=\s*trail_break|pos_constr_comma\s*=\s*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
 
@@ -5587,7 +5750,7 @@ 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
+Choices=pos_class_colon\s*=\s*ignore|pos_class_colon\s*=\s*break|pos_class_colon\s*=\s*force|pos_class_colon\s*=\s*lead|pos_class_colon\s*=\s*trail|pos_class_colon\s*=\s*join|pos_class_colon\s*=\s*lead_break|pos_class_colon\s*=\s*lead_force|pos_class_colon\s*=\s*trail_break|pos_class_colon\s*=\s*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
 
@@ -5596,7 +5759,7 @@ 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
+Choices=pos_constr_colon\s*=\s*ignore|pos_constr_colon\s*=\s*break|pos_constr_colon\s*=\s*force|pos_constr_colon\s*=\s*lead|pos_constr_colon\s*=\s*trail|pos_constr_colon\s*=\s*join|pos_constr_colon\s*=\s*lead_break|pos_constr_colon\s*=\s*lead_force|pos_constr_colon\s*=\s*trail_break|pos_constr_colon\s*=\s*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
 
@@ -5605,7 +5768,7 @@ 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
+Choices=pos_shift\s*=\s*ignore|pos_shift\s*=\s*break|pos_shift\s*=\s*force|pos_shift\s*=\s*lead|pos_shift\s*=\s*trail|pos_shift\s*=\s*join|pos_shift\s*=\s*lead_break|pos_shift\s*=\s*lead_force|pos_shift\s*=\s*trail_break|pos_shift\s*=\s*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
 
@@ -5614,7 +5777,7 @@ Category=6
 Description="<html>Try to limit code width to N columns.</html>"
 Enabled=false
 EditorType=numeric
-CallName="code_width="
+CallName="code_width\s*=\s*"
 MinVal=0
 MaxVal=10000
 ValueDefault=0
@@ -5624,7 +5787,7 @@ 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
+TrueFalse=ls_for_split_full\s*=\s*true|ls_for_split_full\s*=\s*false
 ValueDefault=false
 
 [Ls Func Split Full]
@@ -5632,7 +5795,7 @@ 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
+TrueFalse=ls_func_split_full\s*=\s*true|ls_func_split_full\s*=\s*false
 ValueDefault=false
 
 [Ls Code Width]
@@ -5640,7 +5803,7 @@ 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
+TrueFalse=ls_code_width\s*=\s*true|ls_code_width\s*=\s*false
 ValueDefault=false
 
 [Align Keep Tabs]
@@ -5648,7 +5811,7 @@ Category=7
 Description="<html>Whether to keep non-indenting tabs.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=align_keep_tabs=true|align_keep_tabs=false
+TrueFalse=align_keep_tabs\s*=\s*true|align_keep_tabs\s*=\s*false
 ValueDefault=false
 
 [Align With Tabs]
@@ -5656,7 +5819,7 @@ Category=7
 Description="<html>Whether to use tabs for aligning.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=align_with_tabs=true|align_with_tabs=false
+TrueFalse=align_with_tabs\s*=\s*true|align_with_tabs\s*=\s*false
 ValueDefault=false
 
 [Align On Tabstop]
@@ -5664,7 +5827,7 @@ 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
+TrueFalse=align_on_tabstop\s*=\s*true|align_on_tabstop\s*=\s*false
 ValueDefault=false
 
 [Align Number Right]
@@ -5672,7 +5835,7 @@ Category=7
 Description="<html>Whether to right-align numbers.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=align_number_right=true|align_number_right=false
+TrueFalse=align_number_right\s*=\s*true|align_number_right\s*=\s*false
 ValueDefault=false
 
 [Align Keep Extra Space]
@@ -5680,7 +5843,7 @@ 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
+TrueFalse=align_keep_extra_space\s*=\s*true|align_keep_extra_space\s*=\s*false
 ValueDefault=false
 
 [Align Func Params]
@@ -5688,7 +5851,7 @@ 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
+TrueFalse=align_func_params\s*=\s*true|align_func_params\s*=\s*false
 ValueDefault=false
 
 [Align Func Params Span]
@@ -5696,7 +5859,7 @@ 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="
+CallName="align_func_params_span\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5706,7 +5869,7 @@ 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="
+CallName="align_func_params_thresh\s*=\s*"
 MinVal=-1000
 MaxVal=5000
 ValueDefault=0
@@ -5716,7 +5879,7 @@ Category=7
 Description="<html>The gap for aligning function parameter definitions.</html>"
 Enabled=false
 EditorType=numeric
-CallName="align_func_params_gap="
+CallName="align_func_params_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5726,7 +5889,7 @@ 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="
+CallName="align_constr_value_span\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5736,7 +5899,7 @@ 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="
+CallName="align_constr_value_thresh\s*=\s*"
 MinVal=-1000
 MaxVal=5000
 ValueDefault=0
@@ -5746,7 +5909,7 @@ Category=7
 Description="<html>The gap for aligning constructor value.</html>"
 Enabled=false
 EditorType=numeric
-CallName="align_constr_value_gap="
+CallName="align_constr_value_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5756,7 +5919,7 @@ 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
+TrueFalse=align_same_func_call_params\s*=\s*true|align_same_func_call_params\s*=\s*false
 ValueDefault=false
 
 [Align Same Func Call Params Span]
@@ -5764,7 +5927,7 @@ 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="
+CallName="align_same_func_call_params_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -5774,7 +5937,7 @@ 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="
+CallName="align_same_func_call_params_thresh\s*=\s*"
 MinVal=-1000
 MaxVal=5000
 ValueDefault=0
@@ -5784,7 +5947,7 @@ 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="
+CallName="align_var_def_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -5794,7 +5957,7 @@ 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="
+CallName="align_var_def_star_style\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -5804,7 +5967,7 @@ 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="
+CallName="align_var_def_amp_style\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -5814,7 +5977,7 @@ 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="
+CallName="align_var_def_thresh\s*=\s*"
 MinVal=-1000
 MaxVal=5000
 ValueDefault=0
@@ -5824,7 +5987,7 @@ Category=7
 Description="<html>The gap for aligning variable definitions.</html>"
 Enabled=false
 EditorType=numeric
-CallName="align_var_def_gap="
+CallName="align_var_def_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5834,7 +5997,7 @@ 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
+TrueFalse=align_var_def_colon\s*=\s*true|align_var_def_colon\s*=\s*false
 ValueDefault=false
 
 [Align Var Def Colon Gap]
@@ -5842,7 +6005,7 @@ 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="
+CallName="align_var_def_colon_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5852,7 +6015,7 @@ 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
+TrueFalse=align_var_def_attribute\s*=\s*true|align_var_def_attribute\s*=\s*false
 ValueDefault=false
 
 [Align Var Def Inline]
@@ -5860,7 +6023,7 @@ 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
+TrueFalse=align_var_def_inline\s*=\s*true|align_var_def_inline\s*=\s*false
 ValueDefault=false
 
 [Align Assign Span]
@@ -5868,7 +6031,7 @@ 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="
+CallName="align_assign_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -5878,7 +6041,7 @@ 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="
+CallName="align_assign_func_proto_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -5888,7 +6051,7 @@ 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="
+CallName="align_assign_thresh\s*=\s*"
 MinVal=-1000
 MaxVal=5000
 ValueDefault=0
@@ -5898,7 +6061,7 @@ Category=7
 Description="<html>Whether to align on the left most assignment when multiple<br/>definitions are found on the same line.<br/>Depends on 'align_assign_span' and 'align_assign_thresh' settings.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=align_assign_on_multi_var_defs=true|align_assign_on_multi_var_defs=false
+TrueFalse=align_assign_on_multi_var_defs\s*=\s*true|align_assign_on_multi_var_defs\s*=\s*false
 ValueDefault=false
 
 [Align Braced Init List Span]
@@ -5906,7 +6069,7 @@ Category=7
 Description="<html>The span for aligning on '{' in braced init list.<br/><br/>0: Don't align (default).</html>"
 Enabled=false
 EditorType=numeric
-CallName="align_braced_init_list_span="
+CallName="align_braced_init_list_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -5916,7 +6079,7 @@ Category=7
 Description="<html>The threshold for aligning on '{' in braced init list.<br/>Use a negative number for absolute thresholds.<br/><br/>0: No limit (default).</html>"
 Enabled=false
 EditorType=numeric
-CallName="align_braced_init_list_thresh="
+CallName="align_braced_init_list_thresh\s*=\s*"
 MinVal=-1000
 MaxVal=5000
 ValueDefault=0
@@ -5926,7 +6089,7 @@ 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="
+CallName="align_assign_decl_func\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -5936,7 +6099,7 @@ 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="
+CallName="align_enum_equ_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -5946,7 +6109,7 @@ 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="
+CallName="align_enum_equ_thresh\s*=\s*"
 MinVal=-1000
 MaxVal=5000
 ValueDefault=0
@@ -5956,7 +6119,7 @@ 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="
+CallName="align_var_class_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -5966,7 +6129,7 @@ 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="
+CallName="align_var_class_thresh\s*=\s*"
 MinVal=-1000
 MaxVal=5000
 ValueDefault=0
@@ -5976,7 +6139,7 @@ Category=7
 Description="<html>The gap for aligning class member definitions.</html>"
 Enabled=false
 EditorType=numeric
-CallName="align_var_class_gap="
+CallName="align_var_class_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -5986,7 +6149,7 @@ 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="
+CallName="align_var_struct_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -5996,7 +6159,7 @@ 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="
+CallName="align_var_struct_thresh\s*=\s*"
 MinVal=-1000
 MaxVal=5000
 ValueDefault=0
@@ -6006,7 +6169,7 @@ Category=7
 Description="<html>The gap for aligning struct/union member definitions.</html>"
 Enabled=false
 EditorType=numeric
-CallName="align_var_struct_gap="
+CallName="align_var_struct_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -6016,7 +6179,7 @@ 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="
+CallName="align_struct_init_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -6026,7 +6189,7 @@ 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="
+CallName="align_typedef_span\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -6036,7 +6199,7 @@ 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="
+CallName="align_typedef_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -6046,7 +6209,7 @@ 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="
+CallName="align_typedef_func\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -6056,7 +6219,7 @@ 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="
+CallName="align_typedef_star_style\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -6066,7 +6229,7 @@ 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="
+CallName="align_typedef_amp_style\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -6076,7 +6239,7 @@ 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="
+CallName="align_right_cmt_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -6086,7 +6249,7 @@ 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="
+CallName="align_right_cmt_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -6096,7 +6259,7 @@ 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
+TrueFalse=align_right_cmt_mix\s*=\s*true|align_right_cmt_mix\s*=\s*false
 ValueDefault=false
 
 [Align Right Cmt Same Level]
@@ -6104,7 +6267,7 @@ 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
+TrueFalse=align_right_cmt_same_level\s*=\s*true|align_right_cmt_same_level\s*=\s*false
 ValueDefault=false
 
 [Align Right Cmt At Col]
@@ -6112,7 +6275,7 @@ 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="
+CallName="align_right_cmt_at_col\s*=\s*"
 MinVal=0
 MaxVal=200
 ValueDefault=0
@@ -6122,17 +6285,25 @@ 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="
+CallName="align_func_proto_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
 
+[Align Func Proto Span Ignore Cont Lines]
+Category=7
+Description="<html>Whether to ignore continuation lines when evaluating the number of<br/>new lines for the function prototype alignment's span.<br/><br/>false: continuation lines are part of the newlines count<br/>true:  continuation lines are not counted</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_func_proto_span_ignore_cont_lines\s*=\s*true|align_func_proto_span_ignore_cont_lines\s*=\s*false
+ValueDefault=false
+
 [Align Func Proto Star Style]
 Category=7
 Description="<html>How to consider (or treat) the '*' in the alignment of function prototypes.<br/><br/>0: Part of the type     'void *   foo();' (default)<br/>1: Part of the function '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_func_proto_star_style="
+CallName="align_func_proto_star_style\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -6142,7 +6313,7 @@ Category=7
 Description="<html>How to consider (or treat) the '&amp;' in the alignment of function prototypes.<br/><br/>0: Part of the type     'long &amp;   foo();' (default)<br/>1: Part of the function '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_func_proto_amp_style="
+CallName="align_func_proto_amp_style\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -6152,7 +6323,7 @@ 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="
+CallName="align_func_proto_thresh\s*=\s*"
 MinVal=-1000
 MaxVal=5000
 ValueDefault=0
@@ -6162,7 +6333,7 @@ Category=7
 Description="<html>Minimum gap between the return type and the function name.</html>"
 Enabled=false
 EditorType=numeric
-CallName="align_func_proto_gap="
+CallName="align_func_proto_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -6172,7 +6343,7 @@ 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
+TrueFalse=align_on_operator\s*=\s*true|align_on_operator\s*=\s*false
 ValueDefault=false
 
 [Align Mix Var Proto]
@@ -6180,7 +6351,7 @@ 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
+TrueFalse=align_mix_var_proto\s*=\s*true|align_mix_var_proto\s*=\s*false
 ValueDefault=false
 
 [Align Single Line Func]
@@ -6188,7 +6359,7 @@ 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
+TrueFalse=align_single_line_func\s*=\s*true|align_single_line_func\s*=\s*false
 ValueDefault=false
 
 [Align Single Line Brace]
@@ -6196,7 +6367,7 @@ 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
+TrueFalse=align_single_line_brace\s*=\s*true|align_single_line_brace\s*=\s*false
 ValueDefault=false
 
 [Align Single Line Brace Gap]
@@ -6204,7 +6375,7 @@ Category=7
 Description="<html>Gap for align_single_line_brace.</html>"
 Enabled=false
 EditorType=numeric
-CallName="align_single_line_brace_gap="
+CallName="align_single_line_brace_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -6214,25 +6385,37 @@ 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="
+CallName="align_oc_msg_spec_span\s*=\s*"
 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>"
+Description="<html>Whether and how to align backslashes that split a macro onto multiple lines.<br/>This will not work right if the macro contains a multi-line comment.<br/><br/>0: Do nothing (default)<br/>1: Align the backslashes in the column at the end of the longest line<br/>2: Align with the backslash that is farthest to the left, or, if that<br/>   backslash is farther left than the end of the longest line, at the end of<br/>   the longest line<br/>3: Align with the backslash that is farthest to the right</html>"
 Enabled=false
-EditorType=boolean
-TrueFalse=align_nl_cont=true|align_nl_cont=false
-ValueDefault=false
+EditorType=numeric
+CallName="align_nl_cont\s*=\s*"
+MinVal=0
+MaxVal=3
+ValueDefault=0
+
+[Align Nl Cont Spaces]
+Category=7
+Description="<html>The minimum number of spaces between the end of a line and its continuation<br/>backslash. Requires align_nl_cont.<br/><br/>Default: 1</html>"
+Enabled=false
+EditorType=numeric
+CallName="align_nl_cont_spaces\s*=\s*"
+MinVal=0
+MaxVal=16
+ValueDefault=1
 
 [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
+TrueFalse=align_pp_define_together\s*=\s*true|align_pp_define_together\s*=\s*false
 ValueDefault=false
 
 [Align Pp Define Span]
@@ -6240,7 +6423,7 @@ 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="
+CallName="align_pp_define_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -6250,7 +6433,7 @@ 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="
+CallName="align_pp_define_gap\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -6260,7 +6443,7 @@ 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
+TrueFalse=align_left_shift\s*=\s*true|align_left_shift\s*=\s*false
 ValueDefault=true
 
 [Align Eigen Comma Init]
@@ -6268,7 +6451,7 @@ 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
+TrueFalse=align_eigen_comma_init\s*=\s*true|align_eigen_comma_init\s*=\s*false
 ValueDefault=false
 
 [Align Asm Colon]
@@ -6276,7 +6459,7 @@ 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
+TrueFalse=align_asm_colon\s*=\s*true|align_asm_colon\s*=\s*false
 ValueDefault=false
 
 [Align Oc Msg Colon Span]
@@ -6284,7 +6467,7 @@ 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="
+CallName="align_oc_msg_colon_span\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -6294,7 +6477,7 @@ 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
+TrueFalse=align_oc_msg_colon_first\s*=\s*true|align_oc_msg_colon_first\s*=\s*false
 ValueDefault=false
 
 [Align Oc Decl Colon]
@@ -6302,7 +6485,7 @@ 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
+TrueFalse=align_oc_decl_colon\s*=\s*true|align_oc_decl_colon\s*=\s*false
 ValueDefault=false
 
 [Align Oc Msg Colon Xcode Like]
@@ -6310,7 +6493,7 @@ 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/>alignment)</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=align_oc_msg_colon_xcode_like=true|align_oc_msg_colon_xcode_like=false
+TrueFalse=align_oc_msg_colon_xcode_like\s*=\s*true|align_oc_msg_colon_xcode_like\s*=\s*false
 ValueDefault=false
 
 [Cmt Width]
@@ -6318,7 +6501,7 @@ Category=8
 Description="<html>Try to wrap comments at N columns.</html>"
 Enabled=false
 EditorType=numeric
-CallName="cmt_width="
+CallName="cmt_width\s*=\s*"
 MinVal=0
 MaxVal=256
 ValueDefault=0
@@ -6328,7 +6511,7 @@ 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="
+CallName="cmt_reflow_mode\s*=\s*"
 MinVal=0
 MaxVal=2
 ValueDefault=0
@@ -6337,7 +6520,7 @@ ValueDefault=0
 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=
+CallName=cmt_reflow_fold_regex_file\s*=\s*
 EditorType=string
 ValueDefault=
 
@@ -6346,7 +6529,7 @@ 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
+TrueFalse=cmt_reflow_indent_to_paragraph_start\s*=\s*true|cmt_reflow_indent_to_paragraph_start\s*=\s*false
 ValueDefault=false
 
 [Cmt Convert Tab To Spaces]
@@ -6354,7 +6537,7 @@ 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
+TrueFalse=cmt_convert_tab_to_spaces\s*=\s*true|cmt_convert_tab_to_spaces\s*=\s*false
 ValueDefault=false
 
 [Cmt Indent Multi]
@@ -6362,7 +6545,7 @@ 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
+TrueFalse=cmt_indent_multi\s*=\s*true|cmt_indent_multi\s*=\s*false
 ValueDefault=true
 
 [Cmt Align Doxygen Javadoc Tags]
@@ -6370,7 +6553,7 @@ 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
+TrueFalse=cmt_align_doxygen_javadoc_tags\s*=\s*true|cmt_align_doxygen_javadoc_tags\s*=\s*false
 ValueDefault=false
 
 [Cmt Sp Before Doxygen Javadoc Tags]
@@ -6378,7 +6561,7 @@ 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="
+CallName="cmt_sp_before_doxygen_javadoc_tags\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=1
@@ -6388,7 +6571,7 @@ Category=8
 Description="<html>Whether to change trailing, single-line c-comments into cpp-comments.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=cmt_trailing_single_line_c_to_cpp=true|cmt_trailing_single_line_c_to_cpp=false
+TrueFalse=cmt_trailing_single_line_c_to_cpp\s*=\s*true|cmt_trailing_single_line_c_to_cpp\s*=\s*false
 ValueDefault=false
 
 [Cmt C Group]
@@ -6396,7 +6579,7 @@ 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
+TrueFalse=cmt_c_group\s*=\s*true|cmt_c_group\s*=\s*false
 ValueDefault=false
 
 [Cmt C Nl Start]
@@ -6404,7 +6587,7 @@ 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
+TrueFalse=cmt_c_nl_start\s*=\s*true|cmt_c_nl_start\s*=\s*false
 ValueDefault=false
 
 [Cmt C Nl End]
@@ -6412,7 +6595,7 @@ 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
+TrueFalse=cmt_c_nl_end\s*=\s*true|cmt_c_nl_end\s*=\s*false
 ValueDefault=false
 
 [Cmt Cpp To C]
@@ -6420,7 +6603,7 @@ 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
+TrueFalse=cmt_cpp_to_c\s*=\s*true|cmt_cpp_to_c\s*=\s*false
 ValueDefault=false
 
 [Cmt Cpp Group]
@@ -6428,7 +6611,7 @@ 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
+TrueFalse=cmt_cpp_group\s*=\s*true|cmt_cpp_group\s*=\s*false
 ValueDefault=false
 
 [Cmt Cpp Nl Start]
@@ -6436,7 +6619,7 @@ 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
+TrueFalse=cmt_cpp_nl_start\s*=\s*true|cmt_cpp_nl_start\s*=\s*false
 ValueDefault=false
 
 [Cmt Cpp Nl End]
@@ -6444,7 +6627,7 @@ 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
+TrueFalse=cmt_cpp_nl_end\s*=\s*true|cmt_cpp_nl_end\s*=\s*false
 ValueDefault=false
 
 [Cmt Star Cont]
@@ -6452,7 +6635,7 @@ 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
+TrueFalse=cmt_star_cont\s*=\s*true|cmt_star_cont\s*=\s*false
 ValueDefault=false
 
 [Cmt Sp Before Star Cont]
@@ -6460,7 +6643,7 @@ 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="
+CallName="cmt_sp_before_star_cont\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -6470,7 +6653,7 @@ 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="
+CallName="cmt_sp_after_star_cont\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -6480,7 +6663,7 @@ 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
+TrueFalse=cmt_multi_check_last\s*=\s*true|cmt_multi_check_last\s*=\s*false
 ValueDefault=true
 
 [Cmt Multi First Len Minimum]
@@ -6488,7 +6671,7 @@ 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="
+CallName="cmt_multi_first_len_minimum\s*=\s*"
 MinVal=1
 MaxVal=20
 ValueDefault=4
@@ -6497,7 +6680,7 @@ ValueDefault=4
 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=
+CallName=cmt_insert_file_header\s*=\s*
 EditorType=string
 ValueDefault=
 
@@ -6505,7 +6688,7 @@ ValueDefault=
 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=
+CallName=cmt_insert_file_footer\s*=\s*
 EditorType=string
 ValueDefault=
 
@@ -6513,7 +6696,7 @@ ValueDefault=
 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=
+CallName=cmt_insert_func_header\s*=\s*
 EditorType=string
 ValueDefault=
 
@@ -6521,7 +6704,7 @@ ValueDefault=
 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=
+CallName=cmt_insert_class_header\s*=\s*
 EditorType=string
 ValueDefault=
 
@@ -6529,7 +6712,7 @@ ValueDefault=
 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=
+CallName=cmt_insert_oc_msg_header\s*=\s*
 EditorType=string
 ValueDefault=
 
@@ -6538,7 +6721,7 @@ 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
+TrueFalse=cmt_insert_before_preproc\s*=\s*true|cmt_insert_before_preproc\s*=\s*false
 ValueDefault=false
 
 [Cmt Insert Before Inlines]
@@ -6546,7 +6729,7 @@ 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
+TrueFalse=cmt_insert_before_inlines\s*=\s*true|cmt_insert_before_inlines\s*=\s*false
 ValueDefault=true
 
 [Cmt Insert Before Ctor Dtor]
@@ -6554,7 +6737,7 @@ 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
+TrueFalse=cmt_insert_before_ctor_dtor\s*=\s*true|cmt_insert_before_ctor_dtor\s*=\s*false
 ValueDefault=false
 
 [Mod Full Brace Do]
@@ -6562,7 +6745,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|mod_full_brace_do=not_defined
+Choices=mod_full_brace_do\s*=\s*ignore|mod_full_brace_do\s*=\s*add|mod_full_brace_do\s*=\s*remove|mod_full_brace_do\s*=\s*force|mod_full_brace_do\s*=\s*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
 
@@ -6571,7 +6754,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|mod_full_brace_for=not_defined
+Choices=mod_full_brace_for\s*=\s*ignore|mod_full_brace_for\s*=\s*add|mod_full_brace_for\s*=\s*remove|mod_full_brace_for\s*=\s*force|mod_full_brace_for\s*=\s*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
 
@@ -6580,7 +6763,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|mod_full_brace_function=not_defined
+Choices=mod_full_brace_function\s*=\s*ignore|mod_full_brace_function\s*=\s*add|mod_full_brace_function\s*=\s*remove|mod_full_brace_function\s*=\s*force|mod_full_brace_function\s*=\s*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
 
@@ -6589,7 +6772,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|mod_full_brace_if=not_defined
+Choices=mod_full_brace_if\s*=\s*ignore|mod_full_brace_if\s*=\s*add|mod_full_brace_if\s*=\s*remove|mod_full_brace_if\s*=\s*force|mod_full_brace_if\s*=\s*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
 
@@ -6598,7 +6781,7 @@ 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. Overrides mod_full_brace_if.<br/><br/>0: Don't override mod_full_brace_if<br/>1: Add braces to all blocks if any block needs braces and remove braces if<br/>   they can be removed from all blocks<br/>2: Add braces to all blocks if any block already has braces, regardless of<br/>   whether it needs them<br/>3: Add braces to all blocks if any block needs braces and remove braces if<br/>   they can be removed from all blocks, except if all blocks have braces<br/>   despite none needing them</html>"
 Enabled=false
 EditorType=numeric
-CallName="mod_full_brace_if_chain="
+CallName="mod_full_brace_if_chain\s*=\s*"
 MinVal=0
 MaxVal=3
 ValueDefault=0
@@ -6608,7 +6791,7 @@ 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
+TrueFalse=mod_full_brace_if_chain_only\s*=\s*true|mod_full_brace_if_chain_only\s*=\s*false
 ValueDefault=false
 
 [Mod Full Brace While]
@@ -6616,7 +6799,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|mod_full_brace_while=not_defined
+Choices=mod_full_brace_while\s*=\s*ignore|mod_full_brace_while\s*=\s*add|mod_full_brace_while\s*=\s*remove|mod_full_brace_while\s*=\s*force|mod_full_brace_while\s*=\s*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
 
@@ -6625,7 +6808,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|mod_full_brace_using=not_defined
+Choices=mod_full_brace_using\s*=\s*ignore|mod_full_brace_using\s*=\s*add|mod_full_brace_using\s*=\s*remove|mod_full_brace_using\s*=\s*force|mod_full_brace_using\s*=\s*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
 
@@ -6634,7 +6817,7 @@ Category=9
 Description="<html>Don't remove braces around statements that span N newlines</html>"
 Enabled=false
 EditorType=numeric
-CallName="mod_full_brace_nl="
+CallName="mod_full_brace_nl\s*=\s*"
 MinVal=0
 MaxVal=5000
 ValueDefault=0
@@ -6644,7 +6827,7 @@ 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
+TrueFalse=mod_full_brace_nl_block_rem_mlcond\s*=\s*true|mod_full_brace_nl_block_rem_mlcond\s*=\s*false
 ValueDefault=false
 
 [Mod Paren On Return]
@@ -6652,7 +6835,7 @@ Category=9
 Description="<html>Add or remove unnecessary parentheses 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
+Choices=mod_paren_on_return\s*=\s*ignore|mod_paren_on_return\s*=\s*add|mod_paren_on_return\s*=\s*remove|mod_paren_on_return\s*=\s*force|mod_paren_on_return\s*=\s*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
 
@@ -6661,7 +6844,7 @@ Category=9
 Description="<html>Add or remove unnecessary parentheses on 'throw' statement.</html>"
 Enabled=false
 EditorType=multiple
-Choices=mod_paren_on_throw=ignore|mod_paren_on_throw=add|mod_paren_on_throw=remove|mod_paren_on_throw=force|mod_paren_on_throw=not_defined
+Choices=mod_paren_on_throw\s*=\s*ignore|mod_paren_on_throw\s*=\s*add|mod_paren_on_throw\s*=\s*remove|mod_paren_on_throw\s*=\s*force|mod_paren_on_throw\s*=\s*not_defined
 ChoicesReadable="Ignore Mod Paren On Throw|Add Mod Paren On Throw|Remove Mod Paren On Throw|Force Mod Paren On Throw"
 ValueDefault=ignore
 
@@ -6670,7 +6853,7 @@ 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
+TrueFalse=mod_pawn_semicolon\s*=\s*true|mod_pawn_semicolon\s*=\s*false
 ValueDefault=false
 
 [Mod Full Paren If Bool]
@@ -6678,7 +6861,7 @@ 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
+TrueFalse=mod_full_paren_if_bool\s*=\s*true|mod_full_paren_if_bool\s*=\s*false
 ValueDefault=false
 
 [Mod Full Paren Assign Bool]
@@ -6686,7 +6869,7 @@ Category=9
 Description="<html>Whether to fully parenthesize Boolean expressions after '='<br/>statement, as in 'x = a &amp;&amp; b &gt; c;' =&gt; 'x = (a &amp;&amp; (b &gt; c));'.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=mod_full_paren_assign_bool=true|mod_full_paren_assign_bool=false
+TrueFalse=mod_full_paren_assign_bool\s*=\s*true|mod_full_paren_assign_bool\s*=\s*false
 ValueDefault=false
 
 [Mod Full Paren Return Bool]
@@ -6694,7 +6877,7 @@ Category=9
 Description="<html>Whether to fully parenthesize Boolean expressions after '='<br/>statement, as in 'return  a &amp;&amp; b &gt; c;' =&gt; 'return (a &amp;&amp; (b &gt; c));'.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=mod_full_paren_return_bool=true|mod_full_paren_return_bool=false
+TrueFalse=mod_full_paren_return_bool\s*=\s*true|mod_full_paren_return_bool\s*=\s*false
 ValueDefault=false
 
 [Mod Remove Extra Semicolon]
@@ -6702,7 +6885,7 @@ 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
+TrueFalse=mod_remove_extra_semicolon\s*=\s*true|mod_remove_extra_semicolon\s*=\s*false
 ValueDefault=false
 
 [Mod Remove Duplicate Include]
@@ -6710,7 +6893,15 @@ Category=9
 Description="<html>Whether to remove duplicate include.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=mod_remove_duplicate_include=true|mod_remove_duplicate_include=false
+TrueFalse=mod_remove_duplicate_include\s*=\s*true|mod_remove_duplicate_include\s*=\s*false
+ValueDefault=false
+
+[Mod Add Force C Closebrace Comment]
+Category=9
+Description="<html>the following options (mod_XX_closebrace_comment) use different comment,<br/>depending of the setting of the next option.<br/>false: Use the c comment (default)<br/>true : Use the cpp comment</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_add_force_c_closebrace_comment\s*=\s*true|mod_add_force_c_closebrace_comment\s*=\s*false
 ValueDefault=false
 
 [Mod Add Long Function Closebrace Comment]
@@ -6718,7 +6909,7 @@ 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="
+CallName="mod_add_long_function_closebrace_comment\s*=\s*"
 MinVal=0
 MaxVal=255
 ValueDefault=0
@@ -6728,7 +6919,7 @@ 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="
+CallName="mod_add_long_namespace_closebrace_comment\s*=\s*"
 MinVal=0
 MaxVal=255
 ValueDefault=0
@@ -6738,7 +6929,7 @@ 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="
+CallName="mod_add_long_class_closebrace_comment\s*=\s*"
 MinVal=0
 MaxVal=255
 ValueDefault=0
@@ -6748,7 +6939,7 @@ 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="
+CallName="mod_add_long_switch_closebrace_comment\s*=\s*"
 MinVal=0
 MaxVal=255
 ValueDefault=0
@@ -6758,7 +6949,7 @@ 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="
+CallName="mod_add_long_ifdef_endif_comment\s*=\s*"
 MinVal=0
 MaxVal=255
 ValueDefault=0
@@ -6768,7 +6959,7 @@ 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="
+CallName="mod_add_long_ifdef_else_comment\s*=\s*"
 MinVal=0
 MaxVal=255
 ValueDefault=0
@@ -6778,7 +6969,7 @@ 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
+TrueFalse=mod_sort_case_sensitive\s*=\s*true|mod_sort_case_sensitive\s*=\s*false
 ValueDefault=false
 
 [Mod Sort Import]
@@ -6786,7 +6977,7 @@ 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
+TrueFalse=mod_sort_import\s*=\s*true|mod_sort_import\s*=\s*false
 ValueDefault=false
 
 [Mod Sort Using]
@@ -6794,7 +6985,7 @@ 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
+TrueFalse=mod_sort_using\s*=\s*true|mod_sort_using\s*=\s*false
 ValueDefault=false
 
 [Mod Sort Include]
@@ -6802,7 +6993,7 @@ 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
+TrueFalse=mod_sort_include\s*=\s*true|mod_sort_include\s*=\s*false
 ValueDefault=false
 
 [Mod Sort Incl Import Prioritize Filename]
@@ -6810,7 +7001,7 @@ 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
+TrueFalse=mod_sort_incl_import_prioritize_filename\s*=\s*true|mod_sort_incl_import_prioritize_filename\s*=\s*false
 ValueDefault=false
 
 [Mod Sort Incl Import Prioritize Extensionless]
@@ -6818,7 +7009,7 @@ 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
+TrueFalse=mod_sort_incl_import_prioritize_extensionless\s*=\s*true|mod_sort_incl_import_prioritize_extensionless\s*=\s*false
 ValueDefault=false
 
 [Mod Sort Incl Import Prioritize Angle Over Quotes]
@@ -6826,7 +7017,7 @@ 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
+TrueFalse=mod_sort_incl_import_prioritize_angle_over_quotes\s*=\s*true|mod_sort_incl_import_prioritize_angle_over_quotes\s*=\s*false
 ValueDefault=false
 
 [Mod Sort Incl Import Ignore Extension]
@@ -6834,7 +7025,7 @@ 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
+TrueFalse=mod_sort_incl_import_ignore_extension\s*=\s*true|mod_sort_incl_import_ignore_extension\s*=\s*false
 ValueDefault=false
 
 [Mod Sort Incl Import Grouping Enabled]
@@ -6842,7 +7033,7 @@ 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
+TrueFalse=mod_sort_incl_import_grouping_enabled\s*=\s*true|mod_sort_incl_import_grouping_enabled\s*=\s*false
 ValueDefault=false
 
 [Mod Move Case Break]
@@ -6850,7 +7041,7 @@ 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
+TrueFalse=mod_move_case_break\s*=\s*true|mod_move_case_break\s*=\s*false
 ValueDefault=false
 
 [Mod Move Case Return]
@@ -6858,7 +7049,7 @@ Category=9
 Description="<html>Whether to move a 'return' that appears after a fully braced 'case' before<br/>the close brace, as in 'case X: { ... } return;' =&gt; 'case X: { ... return; }'.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=mod_move_case_return=true|mod_move_case_return=false
+TrueFalse=mod_move_case_return\s*=\s*true|mod_move_case_return\s*=\s*false
 ValueDefault=false
 
 [Mod Case Brace]
@@ -6866,7 +7057,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|mod_case_brace=not_defined
+Choices=mod_case_brace\s*=\s*ignore|mod_case_brace\s*=\s*add|mod_case_brace\s*=\s*remove|mod_case_brace\s*=\s*force|mod_case_brace\s*=\s*not_defined
 ChoicesReadable="Ignore Mod Case Brace|Add Mod Case Brace|Remove Mod Case Brace|Force Mod Case Brace"
 ValueDefault=ignore
 
@@ -6875,7 +7066,7 @@ 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
+TrueFalse=mod_remove_empty_return\s*=\s*true|mod_remove_empty_return\s*=\s*false
 ValueDefault=false
 
 [Mod Enum Last Comma]
@@ -6883,7 +7074,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|mod_enum_last_comma=not_defined
+Choices=mod_enum_last_comma\s*=\s*ignore|mod_enum_last_comma\s*=\s*add|mod_enum_last_comma\s*=\s*remove|mod_enum_last_comma\s*=\s*force|mod_enum_last_comma\s*=\s*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
 
@@ -6892,7 +7083,7 @@ Category=9
 Description="<html>Syntax to use for infinite loops.<br/><br/>0: Leave syntax alone (default)<br/>1: Rewrite as `for(;;)`<br/>2: Rewrite as `while(true)`<br/>3: Rewrite as `do`...`while(true);`<br/>4: Rewrite as `while`<br/>5: Rewrite as `do`...`while;`<br/><br/>Infinite loops that do not already match one of these syntaxes are ignored.<br/>Other options that affect loop formatting will be applied after transforming<br/>the syntax.</html>"
 Enabled=false
 EditorType=numeric
-CallName="mod_infinite_loop="
+CallName="mod_infinite_loop\s*=\s*"
 MinVal=0
 MaxVal=5
 ValueDefault=0
@@ -6902,7 +7093,7 @@ Category=9
 Description="<html>Add or remove the 'int' keyword in 'int short'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=mod_int_short=ignore|mod_int_short=add|mod_int_short=remove|mod_int_short=force|mod_int_short=not_defined
+Choices=mod_int_short\s*=\s*ignore|mod_int_short\s*=\s*add|mod_int_short\s*=\s*remove|mod_int_short\s*=\s*force|mod_int_short\s*=\s*not_defined
 ChoicesReadable="Ignore Mod Int Short|Add Mod Int Short|Remove Mod Int Short|Force Mod Int Short"
 ValueDefault=ignore
 
@@ -6911,7 +7102,7 @@ Category=9
 Description="<html>Add or remove the 'int' keyword in 'short int'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=mod_short_int=ignore|mod_short_int=add|mod_short_int=remove|mod_short_int=force|mod_short_int=not_defined
+Choices=mod_short_int\s*=\s*ignore|mod_short_int\s*=\s*add|mod_short_int\s*=\s*remove|mod_short_int\s*=\s*force|mod_short_int\s*=\s*not_defined
 ChoicesReadable="Ignore Mod Short Int|Add Mod Short Int|Remove Mod Short Int|Force Mod Short Int"
 ValueDefault=ignore
 
@@ -6920,7 +7111,7 @@ Category=9
 Description="<html>Add or remove the 'int' keyword in 'int long'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=mod_int_long=ignore|mod_int_long=add|mod_int_long=remove|mod_int_long=force|mod_int_long=not_defined
+Choices=mod_int_long\s*=\s*ignore|mod_int_long\s*=\s*add|mod_int_long\s*=\s*remove|mod_int_long\s*=\s*force|mod_int_long\s*=\s*not_defined
 ChoicesReadable="Ignore Mod Int Long|Add Mod Int Long|Remove Mod Int Long|Force Mod Int Long"
 ValueDefault=ignore
 
@@ -6929,7 +7120,7 @@ Category=9
 Description="<html>Add or remove the 'int' keyword in 'long int'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=mod_long_int=ignore|mod_long_int=add|mod_long_int=remove|mod_long_int=force|mod_long_int=not_defined
+Choices=mod_long_int\s*=\s*ignore|mod_long_int\s*=\s*add|mod_long_int\s*=\s*remove|mod_long_int\s*=\s*force|mod_long_int\s*=\s*not_defined
 ChoicesReadable="Ignore Mod Long Int|Add Mod Long Int|Remove Mod Long Int|Force Mod Long Int"
 ValueDefault=ignore
 
@@ -6938,7 +7129,7 @@ Category=9
 Description="<html>Add or remove the 'int' keyword in 'int signed'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=mod_int_signed=ignore|mod_int_signed=add|mod_int_signed=remove|mod_int_signed=force|mod_int_signed=not_defined
+Choices=mod_int_signed\s*=\s*ignore|mod_int_signed\s*=\s*add|mod_int_signed\s*=\s*remove|mod_int_signed\s*=\s*force|mod_int_signed\s*=\s*not_defined
 ChoicesReadable="Ignore Mod Int Signed|Add Mod Int Signed|Remove Mod Int Signed|Force Mod Int Signed"
 ValueDefault=ignore
 
@@ -6947,7 +7138,7 @@ Category=9
 Description="<html>Add or remove the 'int' keyword in 'signed int'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=mod_signed_int=ignore|mod_signed_int=add|mod_signed_int=remove|mod_signed_int=force|mod_signed_int=not_defined
+Choices=mod_signed_int\s*=\s*ignore|mod_signed_int\s*=\s*add|mod_signed_int\s*=\s*remove|mod_signed_int\s*=\s*force|mod_signed_int\s*=\s*not_defined
 ChoicesReadable="Ignore Mod Signed Int|Add Mod Signed Int|Remove Mod Signed Int|Force Mod Signed Int"
 ValueDefault=ignore
 
@@ -6956,7 +7147,7 @@ Category=9
 Description="<html>Add or remove the 'int' keyword in 'int unsigned'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=mod_int_unsigned=ignore|mod_int_unsigned=add|mod_int_unsigned=remove|mod_int_unsigned=force|mod_int_unsigned=not_defined
+Choices=mod_int_unsigned\s*=\s*ignore|mod_int_unsigned\s*=\s*add|mod_int_unsigned\s*=\s*remove|mod_int_unsigned\s*=\s*force|mod_int_unsigned\s*=\s*not_defined
 ChoicesReadable="Ignore Mod Int Unsigned|Add Mod Int Unsigned|Remove Mod Int Unsigned|Force Mod Int Unsigned"
 ValueDefault=ignore
 
@@ -6965,7 +7156,7 @@ Category=9
 Description="<html>Add or remove the 'int' keyword in 'unsigned int'.</html>"
 Enabled=false
 EditorType=multiple
-Choices=mod_unsigned_int=ignore|mod_unsigned_int=add|mod_unsigned_int=remove|mod_unsigned_int=force|mod_unsigned_int=not_defined
+Choices=mod_unsigned_int\s*=\s*ignore|mod_unsigned_int\s*=\s*add|mod_unsigned_int\s*=\s*remove|mod_unsigned_int\s*=\s*force|mod_unsigned_int\s*=\s*not_defined
 ChoicesReadable="Ignore Mod Unsigned Int|Add Mod Unsigned Int|Remove Mod Unsigned Int|Force Mod Unsigned Int"
 ValueDefault=ignore
 
@@ -6974,7 +7165,7 @@ Category=9
 Description="<html>If there is a situation where mod_int_* and mod_*_int would result in<br/>multiple int keywords, whether to keep the rightmost int (the default) or the<br/>leftmost int.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=mod_int_prefer_int_on_left=true|mod_int_prefer_int_on_left=false
+TrueFalse=mod_int_prefer_int_on_left\s*=\s*true|mod_int_prefer_int_on_left\s*=\s*false
 ValueDefault=false
 
 [Mod Sort Oc Properties]
@@ -6982,7 +7173,7 @@ 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
+TrueFalse=mod_sort_oc_properties\s*=\s*true|mod_sort_oc_properties\s*=\s*false
 ValueDefault=false
 
 [Mod Sort Oc Property Class Weight]
@@ -6990,7 +7181,7 @@ Category=9
 Description="<html>(OC) Weight of a class property modifier.</html>"
 Enabled=false
 EditorType=numeric
-CallName="mod_sort_oc_property_class_weight="
+CallName="mod_sort_oc_property_class_weight\s*=\s*"
 MinVal=
 MaxVal=
 ValueDefault=0
@@ -7000,7 +7191,7 @@ Category=9
 Description="<html>(OC) Weight of 'atomic' and 'nonatomic'.</html>"
 Enabled=false
 EditorType=numeric
-CallName="mod_sort_oc_property_thread_safe_weight="
+CallName="mod_sort_oc_property_thread_safe_weight\s*=\s*"
 MinVal=
 MaxVal=
 ValueDefault=0
@@ -7010,7 +7201,7 @@ Category=9
 Description="<html>(OC) Weight of 'readwrite' when organizing properties.</html>"
 Enabled=false
 EditorType=numeric
-CallName="mod_sort_oc_property_readwrite_weight="
+CallName="mod_sort_oc_property_readwrite_weight\s*=\s*"
 MinVal=
 MaxVal=
 ValueDefault=0
@@ -7020,7 +7211,7 @@ 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="
+CallName="mod_sort_oc_property_reference_weight\s*=\s*"
 MinVal=
 MaxVal=
 ValueDefault=0
@@ -7030,7 +7221,7 @@ 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="
+CallName="mod_sort_oc_property_getter_weight\s*=\s*"
 MinVal=
 MaxVal=
 ValueDefault=0
@@ -7040,7 +7231,7 @@ 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="
+CallName="mod_sort_oc_property_setter_weight\s*=\s*"
 MinVal=
 MaxVal=
 ValueDefault=0
@@ -7050,7 +7241,7 @@ 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="
+CallName="mod_sort_oc_property_nullability_weight\s*=\s*"
 MinVal=
 MaxVal=
 ValueDefault=0
@@ -7060,7 +7251,7 @@ Category=10
 Description="<html>How to use tabs when indenting preprocessor code.<br/><br/>-1: Use 'indent_with_tabs' setting (default)<br/> 0: Spaces only<br/> 1: Indent with tabs to brace level, align with spaces<br/> 2: Indent and align with tabs, using spaces when not on a tabstop<br/><br/>Default: -1</html>"
 Enabled=false
 EditorType=numeric
-CallName="pp_indent_with_tabs="
+CallName="pp_indent_with_tabs\s*=\s*"
 MinVal=-1
 MaxVal=2
 ValueDefault=-1
@@ -7070,7 +7261,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|pp_indent=not_defined
+Choices=pp_indent\s*=\s*ignore|pp_indent\s*=\s*add|pp_indent\s*=\s*remove|pp_indent\s*=\s*force|pp_indent\s*=\s*not_defined
 ChoicesReadable="Ignore Pp Indent|Add Pp Indent|Remove Pp Indent|Force Pp Indent"
 ValueDefault=ignore
 
@@ -7079,7 +7270,7 @@ 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
+TrueFalse=pp_indent_at_level\s*=\s*true|pp_indent_at_level\s*=\s*false
 ValueDefault=false
 
 [Pp Indent At Level0]
@@ -7087,7 +7278,7 @@ Category=10
 Description="<html>Whether to indent #if/#else/#endif at the parenthesis level if the brace<br/>level is 0. If false, these are indented from column 1.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=pp_indent_at_level0=true|pp_indent_at_level0=false
+TrueFalse=pp_indent_at_level0\s*=\s*true|pp_indent_at_level0\s*=\s*false
 ValueDefault=false
 
 [Pp Indent Count]
@@ -7095,7 +7286,7 @@ 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="
+CallName="pp_indent_count\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=1
@@ -7105,7 +7296,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_after=ignore|pp_space_after=add|pp_space_after=remove|pp_space_after=force|pp_space_after=not_defined
+Choices=pp_space_after\s*=\s*ignore|pp_space_after\s*=\s*add|pp_space_after\s*=\s*remove|pp_space_after\s*=\s*force|pp_space_after\s*=\s*not_defined
 ChoicesReadable="Ignore Pp Space After|Add Pp Space After|Remove Pp Space After|Force Pp Space After"
 ValueDefault=ignore
 
@@ -7114,7 +7305,7 @@ Category=10
 Description="<html>Sets the number of spaces per level added with pp_space_after.</html>"
 Enabled=false
 EditorType=numeric
-CallName="pp_space_count="
+CallName="pp_space_count\s*=\s*"
 MinVal=0
 MaxVal=16
 ValueDefault=0
@@ -7124,7 +7315,7 @@ 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="
+CallName="pp_indent_region\s*=\s*"
 MinVal=-16
 MaxVal=16
 ValueDefault=0
@@ -7134,7 +7325,7 @@ 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
+TrueFalse=pp_region_indent_code\s*=\s*true|pp_region_indent_code\s*=\s*false
 ValueDefault=false
 
 [Pp Indent If]
@@ -7142,7 +7333,7 @@ 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="
+CallName="pp_indent_if\s*=\s*"
 MinVal=-16
 MaxVal=16
 ValueDefault=0
@@ -7152,7 +7343,7 @@ 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
+TrueFalse=pp_if_indent_code\s*=\s*true|pp_if_indent_code\s*=\s*false
 ValueDefault=false
 
 [Pp Indent In Guard]
@@ -7160,7 +7351,7 @@ Category=10
 Description="<html>Whether to indent the body of an #if that encompasses all the code in the file.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=pp_indent_in_guard=true|pp_indent_in_guard=false
+TrueFalse=pp_indent_in_guard\s*=\s*true|pp_indent_in_guard\s*=\s*false
 ValueDefault=false
 
 [Pp Define At Level]
@@ -7168,7 +7359,7 @@ 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
+TrueFalse=pp_define_at_level\s*=\s*true|pp_define_at_level\s*=\s*false
 ValueDefault=false
 
 [Pp Include At Level]
@@ -7176,7 +7367,7 @@ Category=10
 Description="<html>Whether to indent '#include' at the brace level.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=pp_include_at_level=true|pp_include_at_level=false
+TrueFalse=pp_include_at_level\s*=\s*true|pp_include_at_level\s*=\s*false
 ValueDefault=false
 
 [Pp Ignore Define Body]
@@ -7184,7 +7375,7 @@ 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
+TrueFalse=pp_ignore_define_body\s*=\s*true|pp_ignore_define_body\s*=\s*false
 ValueDefault=false
 
 [Pp Multiline Define Body Indent]
@@ -7192,7 +7383,7 @@ Category=10
 Description="<html>An offset value that controls the indentation of the body of a multiline #define.<br/>'body' refers to all the lines of a multiline #define except the first line.<br/>Requires 'pp_ignore_define_body = false'.<br/><br/> &lt;0: Absolute column: the body indentation starts off at the specified column<br/>     (ex. -3 ==&gt; the body is indented starting from column 3)<br/>&gt;=0: Relative to the column of the '#' of '#define'<br/>     (ex.  3 ==&gt; the body is indented starting 3 columns at the right of '#')<br/><br/>Default: 8</html>"
 Enabled=false
 EditorType=numeric
-CallName="pp_multiline_define_body_indent="
+CallName="pp_multiline_define_body_indent\s*=\s*"
 MinVal=-32
 MaxVal=32
 ValueDefault=8
@@ -7202,7 +7393,7 @@ Category=10
 Description="<html>Whether to indent case statements between #if, #else, and #endif.<br/>Only applies to the indent of the preprocessor 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
+TrueFalse=pp_indent_case\s*=\s*true|pp_indent_case\s*=\s*false
 ValueDefault=true
 
 [Pp Indent Func Def]
@@ -7210,7 +7401,7 @@ Category=10
 Description="<html>Whether to indent whole function definitions between #if, #else, and #endif.<br/>Only applies to the indent of the preprocessor 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
+TrueFalse=pp_indent_func_def\s*=\s*true|pp_indent_func_def\s*=\s*false
 ValueDefault=true
 
 [Pp Indent Extern]
@@ -7218,7 +7409,7 @@ Category=10
 Description="<html>Whether to indent extern C blocks between #if, #else, and #endif.<br/>Only applies to the indent of the preprocessor 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
+TrueFalse=pp_indent_extern\s*=\s*true|pp_indent_extern\s*=\s*false
 ValueDefault=true
 
 [Pp Indent Brace]
@@ -7226,7 +7417,7 @@ Category=10
 Description="<html>How to indent braces directly inside #if, #else, and #endif.<br/>Requires pp_if_indent_code=true and only applies to the indent of the<br/>preprocessor that the braces are directly inside of.<br/> 0: No extra indent<br/> 1: Indent by one level<br/>-1: Preserve original indentation<br/><br/>Default: 1</html>"
 Enabled=false
 EditorType=numeric
-CallName="pp_indent_brace="
+CallName="pp_indent_brace\s*=\s*"
 MinVal=-1
 MaxVal=1
 ValueDefault=1
@@ -7236,14 +7427,14 @@ Category=10
 Description="<html>Whether to print warning messages for unbalanced #if and #else blocks.<br/>This will print a message in the following cases:<br/>- if an #ifdef block ends on a different indent level than<br/>  where it started from. Example:<br/><br/>   #ifdef TEST<br/>     int i;<br/>     {<br/>       int j;<br/>   #endif<br/><br/>- an #elif/#else block ends on a different indent level than<br/>  the corresponding #ifdef block. Example:<br/><br/>   #ifdef TEST<br/>       int i;<br/>   #else<br/>       }<br/>     int j;<br/>   #endif</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=pp_warn_unbalanced_if=true|pp_warn_unbalanced_if=false
+TrueFalse=pp_warn_unbalanced_if\s*=\s*true|pp_warn_unbalanced_if\s*=\s*false
 ValueDefault=false
 
 [Include Category 0]
 Category=11
 Description="<html>The regex for include category with priority 0.</html>"
 Enabled=false
-CallName=include_category_0=
+CallName=include_category_0\s*=\s*
 EditorType=string
 ValueDefault=
 
@@ -7251,7 +7442,7 @@ ValueDefault=
 Category=11
 Description="<html>The regex for include category with priority 1.</html>"
 Enabled=false
-CallName=include_category_1=
+CallName=include_category_1\s*=\s*
 EditorType=string
 ValueDefault=
 
@@ -7259,7 +7450,7 @@ ValueDefault=
 Category=11
 Description="<html>The regex for include category with priority 2.</html>"
 Enabled=false
-CallName=include_category_2=
+CallName=include_category_2\s*=\s*
 EditorType=string
 ValueDefault=
 
@@ -7268,7 +7459,7 @@ 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
+TrueFalse=use_indent_func_call_param\s*=\s*true|use_indent_func_call_param\s*=\s*false
 ValueDefault=true
 
 [Use Indent Continue Only Once]
@@ -7276,7 +7467,7 @@ 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)<br/><br/>Requires indent_ignore_first_continue=false.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=use_indent_continue_only_once=true|use_indent_continue_only_once=false
+TrueFalse=use_indent_continue_only_once\s*=\s*true|use_indent_continue_only_once\s*=\s*false
 ValueDefault=false
 
 [Indent Cpp Lambda Only Once]
@@ -7284,7 +7475,7 @@ Category=12
 Description="<html>The indentation can be:<br/>- after the assignment, at the '[' character<br/>- at the beginning of the lambda body<br/><br/>true:  indentation will be at the beginning of the lambda body<br/>false: indentation will be after the assignment (default)</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_cpp_lambda_only_once=true|indent_cpp_lambda_only_once=false
+TrueFalse=indent_cpp_lambda_only_once\s*=\s*true|indent_cpp_lambda_only_once\s*=\s*false
 ValueDefault=false
 
 [Use Sp After Angle Always]
@@ -7292,7 +7483,7 @@ 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
+TrueFalse=use_sp_after_angle_always\s*=\s*true|use_sp_after_angle_always\s*=\s*false
 ValueDefault=false
 
 [Use Options Overriding For Qt Macros]
@@ -7300,7 +7491,7 @@ 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
+TrueFalse=use_options_overriding_for_qt_macros\s*=\s*true|use_options_overriding_for_qt_macros\s*=\s*false
 ValueDefault=true
 
 [Use Form Feed No More As Whitespace Character]
@@ -7308,7 +7499,7 @@ 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
+TrueFalse=use_form_feed_no_more_as_whitespace_character\s*=\s*true|use_form_feed_no_more_as_whitespace_character\s*=\s*false
 ValueDefault=false
 
 [Warn Level Tabs Found In Verbatim String Literals]
@@ -7316,7 +7507,7 @@ 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="
+CallName="warn_level_tabs_found_in_verbatim_string_literals\s*=\s*"
 MinVal=1
 MaxVal=3
 ValueDefault=2
@@ -7326,7 +7517,7 @@ 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="
+CallName="debug_max_number_of_loops\s*=\s*"
 MinVal=
 MaxVal=
 ValueDefault=0
@@ -7336,7 +7527,7 @@ 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="
+CallName="debug_line_number_to_protocol\s*=\s*"
 MinVal=
 MaxVal=
 ValueDefault=0
@@ -7346,7 +7537,7 @@ 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="
+CallName="debug_timeout\s*=\s*"
 MinVal=
 MaxVal=
 ValueDefault=0
@@ -7356,7 +7547,7 @@ 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="
+CallName="debug_truncate\s*=\s*"
 MinVal=0
 MaxVal=960
 ValueDefault=0
@@ -7366,7 +7557,7 @@ Category=13
 Description="<html>sort (or not) the tracking info.<br/><br/>Default: true</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=debug_sort_the_tracks=true|debug_sort_the_tracks=false
+TrueFalse=debug_sort_the_tracks\s*=\s*true|debug_sort_the_tracks\s*=\s*false
 ValueDefault=true
 
 [Debug Decode The Flags]
@@ -7374,13 +7565,21 @@ Category=13
 Description="<html>decode (or not) the flags as a new line.<br/>only if the -p option is set.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=debug_decode_the_flags=true|debug_decode_the_flags=false
+TrueFalse=debug_decode_the_flags\s*=\s*true|debug_decode_the_flags\s*=\s*false
 ValueDefault=false
 
+[Debug Use The Exit Function Pop]
+Category=13
+Description="<html>use (or not) the exit(EX_SOFTWARE) function.<br/><br/>Default: true</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=debug_use_the_exit_function_pop\s*=\s*true|debug_use_the_exit_function_pop\s*=\s*false
+ValueDefault=true
+
 [Set Numbering For Html Output]
 Category=13
 Description="<html>insert the number of the line at the beginning of each line</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=set_numbering_for_html_output=true|set_numbering_for_html_output=false
+TrueFalse=set_numbering_for_html_output\s*=\s*true|set_numbering_for_html_output\s*=\s*false
 ValueDefault=false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/unmatched_close_pp.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/unmatched_close_pp.txt
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/unmatched_close_pp.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/unmatched_close_pp.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/v-out.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/v-out.txt
index 129af768..129af768 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/v-out.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/v-out.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/xyz-err.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/xyz-err.txt
index a16550ed..a16550ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/output/xyz-err.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/output/xyz-err.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/test_cli_options.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/test_cli_options.py
index 06b658bc..4416e379 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cli/test_cli_options.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cli/test_cli_options.py
@@ -11,9 +11,11 @@ Tests output generated by Uncrustifys commandline options
 """
 
 from __future__ import print_function
+
+import sys
 from sys import stderr, argv, exit as sys_exit
 from os import makedirs, remove, name as os_name
-from os.path import dirname, relpath, isdir, isfile, join as path_join, split as path_split
+from os.path import dirname, relpath, abspath, isdir, isfile, join as path_join, split as path_split
 from shutil import rmtree, copyfile
 from subprocess import Popen, PIPE
 from io import open
@@ -22,6 +24,7 @@ import re
 import difflib
 import argparse
 import pprint
+#import traceback
 
 if os_name == 'nt':
     EX_OK = 0
@@ -73,7 +76,7 @@ def proc(bin_path, args_arr=()):
     'test'
     """
     if not isfile(bin_path):
-        eprint("bin is not a file: %s" % bin_path)
+        eprint("bin 1 is not a file: %s" % bin_path)
         return False
 
     # call uncrustify, hold output in memory
@@ -121,13 +124,21 @@ def get_file_content(fp):
     the file content
 
     """
+    #print("3-1: fp is "+fp)
+    #print("3-1b: gen_result_path is "+gen_result_path)
     out = None
 
     if isfile(fp):
+        #print("A: "+abspath(fp))
+        #print("2a is a file: %s" % fp)
         with open(fp, encoding="utf-8", newline="\n") as f:
             out = f.read()
-    else:
-        eprint("is not a file: %s" % fp)
+    #else:
+        #print("B: "+abspath(fp))
+        #print("2bx is Not a file: %s" % fp)
+        #for line in traceback.format_stack():
+        #    print(line.strip())
+        #print("2bx+ is Not a file: %s" % fp)
 
     return out
 
@@ -166,14 +177,24 @@ def check_generated_output(gen_expected_path, gen_result_path,
     True
     """
 
+    #print("2-1: gen_expected_path is "+gen_expected_path)
+    #print("2-2: gen_result_path is "+gen_result_path)
     gen_exp_txt = get_file_content(gen_expected_path)
+    #print("2-3: gen_exp_txt is ")
+    #+gen_exp_txt)
     if gen_exp_txt is None:
         return False
 
     gen_res_txt = get_file_content(gen_result_path)
+    #print("2-4: gen_res_txt is "+gen_res_txt)
     if gen_res_txt is None:
         return False
 
+    #print("2: result_manip is "+result_manip)
+    #if result_manip is not None:
+    #    print("2-5: result_manip is "+result_manip)
+    #else:
+    #    print("2-6: result_manip is None")
     if result_manip is not None:
         if type(result_manip) is list or type(result_manip) is tuple:
             for m in result_manip:
@@ -181,6 +202,10 @@ def check_generated_output(gen_expected_path, gen_result_path,
         else:
             gen_res_txt = result_manip(gen_res_txt)
 
+    #print("2-7: gen_res_txt is ")
+    #print(gen_res_txt)
+    #print("2-8: gen_exp_txt is ")
+    #print(gen_exp_txt)
     if gen_res_txt != gen_exp_txt:
         with open(gen_result_path, 'w', encoding="utf-8", newline="") as f:
             f.write(gen_res_txt)
@@ -207,6 +232,7 @@ def check_generated_output(gen_expected_path, gen_result_path,
             return False
 
     remove(gen_result_path)
+    #print(abspath(gen_result_path))
 
     return True
 
@@ -377,6 +403,13 @@ def check_uncrustify_output(
             program_args=program_args):
         ret_flag = False
 
+    #print("1: gen_expected_path is "+gen_expected_path)
+    #print("1: gen_result_path is "+gen_result_path)
+    #if gen_result_manip is not None:
+    #    print("1: gen_result_manip is "+gen_result_manip)
+    #else:
+    #    print("1: gen_result_manip is None")
+    #print("program_args is "+program_args)
     if gen_expected_path and not check_generated_output(
             gen_expected_path, gen_result_path,
             result_manip=gen_result_manip,
@@ -504,7 +537,7 @@ def main(args):
                  s_path_join(bd_dir, 'MinSizeRel/uncrustify.exe')]
     for uncr_bin in bin_paths:
         if not isfile(uncr_bin):
-            eprint("is not a file: %s" % uncr_bin)
+            eprint("is 3 not a file: %s" % uncr_bin)
         else:
             print("Uncrustify binary found: %s" % uncr_bin)
             bin_found = True
@@ -512,11 +545,15 @@ def main(args):
     if not bin_found:
         eprint("No Uncrustify binary found")
         sys_exit(EX_USAGE)
+    print("Summary:")
+    print("Python version is: "+sys.version)
+    print("OS is: %s" % os_name)
 
     clear_dir(s_path_join(test_dir, 'results'))
 
     return_flag = True
 
+    print("Test help ...")
     #
     # Test help
     #   -h -? --help --usage
@@ -531,7 +568,9 @@ def main(args):
                 reg_replace(r'currently \d+ options', 'currently x options')
             ]):
         return_flag = False
+    print("Test help is OK")
 
+    print("Test false parameter ...")
     #
     # Test false parameter
     #   --xyz
@@ -543,7 +582,9 @@ def main(args):
             err_result_path=s_path_join(test_dir, 'results/xyz-err.txt')
             ):
         return_flag = False
+    print("Test false parameter is OK")
 
+    print("Test Version ...")
     #
     # Test Version
     #   -v
@@ -556,8 +597,10 @@ def main(args):
             out_result_manip=reg_replace(r'Uncrustify.+', 'Uncrustify')
             ):
         return_flag = False
+    print("Test Version is OK")
 
     # temporary removed
+    #print("Test --show-config ...")
     ##
     ## Test --show-config
     ##
@@ -570,7 +613,9 @@ def main(args):
     #        out_result_manip=reg_replace(r'\# Uncrustify.+', '')
     #        ):
     #    return_flag = False
+    #print("Test --show-config is OK")
 
+    print("Test the truncate option ...")
     #
     # Test the truncate option
     #
@@ -587,7 +632,9 @@ def main(args):
                               reg_replace(RE_DO_SPACE, '')]
             ):
         return_flag = False
+    print("Test the truncate option is OK")
 
+    #print("Test --update-config ...")
     # temporary removed
     ##
     ## Test --update-config
@@ -619,7 +666,9 @@ def main(args):
     #        err_result_manip=string_replace('\\', '/')
     #        ):
     #    return_flag = False
+    #print("Test --update-config is OK")
 
+    #print("Test --update-config-with-doc ...")
     ##
     ## Test --update-config-with-doc
     ##
@@ -636,6 +685,7 @@ def main(args):
     #        err_result_manip=string_replace('\\', '/')
     #        ):
     #    return_flag = False
+    #print("Test --update-config-with-doc is OK")
 
     #if not check_uncrustify_output(
     #        uncr_bin,
@@ -651,6 +701,7 @@ def main(args):
     #        ):
     #    return_flag = False
 
+    print("Test -p ...")
     #
     # Test -p
     #
@@ -678,6 +729,19 @@ def main(args):
                 ):
             return_flag = False
 
+        if not check_uncrustify_output(
+                uncr_bin,
+                parsed_args,
+                args_arr=['-f', s_path_join(script_dir, 'input/in_fcn_def.cpp'),
+                          '-p', s_path_join(test_dir, 'results/in_fcn_def.txt')],
+                gen_expected_path=s_path_join(script_dir, 'output/in_fcn_def.txt'),
+                gen_result_path=s_path_join(test_dir, 'results/in_fcn_def.txt'),
+                gen_result_manip=reg_replace(r'\# Uncrustify.+[^\n\r]', '')
+                ):
+            return_flag = False
+    print("Test -p is OK")
+
+    #print("Test -p and -c with '-' input ...")
     if os_name == 'nt' or check_uncrustify_output(
             uncr_bin,
             parsed_args,
@@ -689,12 +753,16 @@ def main(args):
             out_result_path=s_path_join(test_dir, 'results/pc-.txt')
     ):
         pass
+
+    #print("Test -p and -c with '-' input ...")
     #
     # Test -p and -c with '-' input
     #
     else:
         return_flag = False
+    #print("Test -p and -c with '-' input is OK")
 
+    print("Test -p and --debug-csv-format option ...")
     #
     # Test -p and --debug-csv-format option
     #
@@ -709,37 +777,46 @@ def main(args):
             gen_result_path=s_path_join(test_dir, 'results/class_enum_struct_union.csv'),
             ):
         return_flag = False
-
-    #
-    # Test --tracking_space FILE
-    #
-    if os_name != 'nt':
-        # &lt; &gt; doesn't work under windows
-        if parsed_args.config == 'Debug':
-            eprint("Debug")
+    print("Test -p and --debug-csv-format option is OK")
+
+    if parsed_args.config == 'Debug':
+        print("Test --tracking space:FILE ...")
+        print("  config is Debug")
+        #
+        # Test --tracking space:FILE
+        #
+        if os_name != 'nt':
+            # doesn't work under windows
+            temp_result_path = s_path_join(script_dir, 'results/Debug_tracking_space.html')
+            abc = "space:" + temp_result_path                   # Issue #4066
             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(test_dir, 'results/Debug_tracking_space.html')],
+                              '--tracking',
+                              abc,
+                              #s_path_join(script_dir, 'results/Debug_tracking_space.html')
+                              #temp_result_path
+                              #  '-L'
+                              #, 'A'
+                              #, '2'
+                              #, '>'
+                              #, '/home/guy/A-T.txt'
+                              ],
                     gen_expected_path=s_path_join(script_dir, 'output/Debug_tracking_space.html'),
-                    gen_result_path=s_path_join(test_dir, 'results/Debug_tracking_space.html'),
-                    ):
-                return_flag = False
-        else:
-            eprint(parsed_args.config)
-            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(test_dir, 'results/tracking_space.html')],
-                    gen_expected_path=s_path_join(script_dir, 'output/tracking_space.html'),
-                    gen_result_path=s_path_join(test_dir, 'results/tracking_space.html'),
+                    #gen_result_path=s_path_join(script_dir, 'results/Debug_tracking_space.html')
+                    gen_result_path=temp_result_path
                     ):
+                #print("/home/guy/A-T.txt")
+            #else:
+                #print("/home/guy/A-T.txt")
                 return_flag = False
+        print("Test --tracking space:FILE is OK")
 
+    #sys_exit()
+
+    print("Test --replace ...")
     #
     # Test --replace
     #
@@ -756,7 +833,9 @@ def main(args):
             err_result_path=s_path_join(test_dir, 'results/replace.txt'),
             ):
         return_flag = False
+    print("Test --replace is OK")
 
+    print("Test --universalindent ...")
     # The flag CMAKE_BUILD_TYPE must be set to "Release", or all lines with
     # 'Description="<html>(<number>)text abc.</html>" must be changed to
     # 'Description="<html>text abc.</html>"
@@ -779,7 +858,9 @@ def main(args):
                               reg_replace(r'\r', '')]
             ):
         return_flag = False
+    print("Test --universalindent is OK")
 
+    print("Test -L ...")
     # Debug Options:
     #   -L
     # look at src/log_levels.h
@@ -801,21 +882,23 @@ def main(args):
                                   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, '')]
+                                  reg_replace(RE_DO_SPACE, ''),
+                                  reg_replace(r'Chunk::', '')]
             ):
             return_flag = False
-
-    # Test logger buffer overflow
-    if not check_uncrustify_output(
-            uncr_bin,
-            parsed_args,
-            args_arr=['-c', NULL_DEVICE, '-L', '99', '-o', NULL_DEVICE,
-                      '-f', s_path_join(script_dir, 'input/logger.cs')],
-            err_expected_path=s_path_join(script_dir, 'output/logger_cs_L_99.txt'),
-            err_result_path=s_path_join(test_dir, 'results/logger_cs_L_99.txt'),
-            err_result_manip=reg_replace(r'[0-9]', '')
-            ):
-        return_flag = False
+    print("Test -L is OK")
+
+    ### Test logger buffer overflow
+    ##if not check_uncrustify_output(
+    ##        uncr_bin,
+    ##        parsed_args,
+    ##        args_arr=['-c', NULL_DEVICE, '-L', '99', '-o', NULL_DEVICE,
+    ##                  '-f', s_path_join(script_dir, 'input/logger.cs')],
+    ##        err_expected_path=s_path_join(script_dir, 'output/logger_cs_L_99.txt'),
+    ##        err_result_path=s_path_join(test_dir, 'results/logger_cs_L_99.txt'),
+    ##        err_result_manip=reg_replace(r'[0-9]', '')
+    ##        ):
+    ##    return_flag = False
 
     # misc error_tests
     error_tests = ["I-842", "unmatched_close_pp"]
@@ -831,6 +914,7 @@ def main(args):
                 ):
             return_flag = False
 
+    print("Test $(year) keyword ...")
     # Test $(year) keyword (issue #3251)
     if not check_uncrustify_output(
             uncr_bin,
@@ -842,6 +926,7 @@ def main(args):
             out_result_manip=string_replace(str(date.today().year), 'this year'),
             ):
         return_flag = False
+    print("Test $(year) keyword is OK")
 
     if return_flag:
         print("all tests are OK")
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/1225.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/1225.cfg
index cbc83adb..cbc83adb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/1225.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/1225.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/1liner-no-split.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/1liner-no-split.cfg
index 84eba64d..c554aba1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/1liner-no-split.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/1liner-no-split.cfg
@@ -1,3 +1,4 @@
+sp_sparen_brace                 = add
 sp_before_sparen                = force
 sp_inside_braces                = force
 sp_fparen_brace                 = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/1liner-split.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/1liner-split.cfg
index e666ea24..e666ea24 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/1liner-split.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/1liner-split.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_2205.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_2205.cfg
new file mode 100644
index 00000000..cc70ad70
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_2205.cfg
@@ -0,0 +1,3 @@
+sp_after_byref = remove
+indent_columns = 4
+sp_addr        = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue-2278.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_2278.cfg
index 80ba4f6f..80ba4f6f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue-2278.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_2278.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_2279.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_2279.cfg
index 1f646668..1f646668 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_2279.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_2279.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_2360-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_2360-a.cfg
index 85052020..aad62f44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_2360-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_2360-a.cfg
@@ -1,3 +1,4 @@
+sp_sparen_brace = add
 nl_multi_line_sparen_open = force
 nl_multi_line_sparen_close = force
 nl_before_if_closing_paren = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_2360-b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_2360-b.cfg
index b61841cc..3354c471 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_2360-b.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_2360-b.cfg
@@ -1,3 +1,4 @@
+sp_sparen_brace = add
 nl_multi_line_sparen_open = false
 nl_multi_line_sparen_close = remove
 nl_before_if_closing_paren = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_2411.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_2411.cfg
index a4770ec9..a4770ec9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_2411.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_2411.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_2640.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_2640.cfg
index a4dd2354..a4dd2354 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_2640.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_2640.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3169.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3169.cfg
index ae9fa1f3..728cfaf6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3169.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3169.cfg
@@ -2,4 +2,4 @@ sp_pp_concat       = ignore
 indent_columns     = 2
 pp_multiline_define_body_indent = 2
 align_var_def_span = 1
-align_nl_cont      = true
+align_nl_cont      = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3233.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3233.cfg
index 71ee918b..71ee918b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3233.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3233.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3269.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3269.cfg
index 3a4bb6bf..3a4bb6bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3269.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3269.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3272.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3272.cfg
index 2cda9402..2cda9402 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3272.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3272.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3274.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3274.cfg
index 63aa1d0c..63aa1d0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3274.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3274.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3327.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3327.cfg
index 1470c6b5..1470c6b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3327.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3327.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3350.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3350.cfg
index d53c8094..d53c8094 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3350.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3350.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3351.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3351.cfg
index 67df4d20..67df4d20 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3351.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3351.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3353.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3353.cfg
index 56810833..56810833 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3353.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3353.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3356.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3356.cfg
index 2791f6c6..2791f6c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3356.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3356.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3370.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3370.cfg
index 05f38590..05f38590 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3370.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3370.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3377.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3377.cfg
index ca7a07db..ca7a07db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3377.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3377.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3402.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3402.cfg
index 5252c78d..5252c78d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3402.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3402.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3431.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3431.cfg
index 45dbff25..45dbff25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3431.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3431.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3454.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3454.cfg
index 9674606a..9674606a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3454.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3454.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3457.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3457.cfg
index 78984566..78984566 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3457.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3457.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3472.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3472.cfg
index 9e1acf21..9e1acf21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3472.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3472.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3476.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3476.cfg
index 3fef0a75..3fef0a75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3476.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3476.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3480.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3480.cfg
index d86880ad..d86880ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3480.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3480.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3493.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3493.cfg
index cfc36660..cfc36660 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3493.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3493.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3506.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3506.cfg
index 6a9f2d25..6a9f2d25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3506.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3506.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3516.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3516.cfg
index ba1f9656..ba1f9656 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3516.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3516.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3517.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3517.cfg
index ed31649e..ed31649e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3517.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3517.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3518.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3518.cfg
index a7caf986..a7caf986 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3518.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3518.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3556.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3556.cfg
index 9840c82d..9840c82d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3556.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3556.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3561.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3561.cfg
index 56965ae8..56965ae8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3561.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3561.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3565.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3565.cfg
index c1a793e8..c1a793e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3565.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3565.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3567-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3567-a.cfg
index 1659f46a..1659f46a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3567-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3567-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3567-b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3567-b.cfg
index 454bc264..454bc264 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3567-b.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3567-b.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3580.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3580.cfg
index fc53aac2..fc53aac2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3580.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3580.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3582.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3582.cfg
index d6b1a287..d6b1a287 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3582.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3582.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3601.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3601.cfg
index 3537fd11..3537fd11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3601.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3601.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3662.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3662.cfg
index 6500adbb..6500adbb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3662.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3662.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3716-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3716-1.cfg
index 481776c1..2fab2c13 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3716-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3716-1.cfg
@@ -1,2 +1,3 @@
+sp_sparen_brace = force
 mod_infinite_loop = 1
 mod_full_brace_for = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3716-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3716-2.cfg
index e3064ece..10462086 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3716-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3716-2.cfg
@@ -1,2 +1,3 @@
+sp_sparen_brace = add
 mod_infinite_loop = 2
 mod_full_brace_while = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3716-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3716-3.cfg
index d803c2fd..d803c2fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3716-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3716-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3716-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3716-4.cfg
index 4ff28748..536b9756 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3716-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3716-4.cfg
@@ -1,2 +1,3 @@
+sp_sparen_brace = force
 mod_infinite_loop = 4
 mod_full_brace_while = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3716-5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3716-5.cfg
index e25c6f03..e25c6f03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3716-5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3716-5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3852.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3852.cfg
index 087272b9..087272b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3852.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3852.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3873.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3873.cfg
index 8179ffa5..8179ffa5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/Issue_3873.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3873.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3989.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3989.cfg
new file mode 100644
index 00000000..459005de
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/Issue_3989.cfg
@@ -0,0 +1,2 @@
+sp_before_unnamed_ptr_star = remove
+sp_before_ptr_star_func    = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/add_long_closebrace_comment_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/add_long_closebrace_comment_1.cfg
index b8190eb1..b8190eb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/add_long_closebrace_comment_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/add_long_closebrace_comment_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align-2.cfg
index ea78a8d4..ea78a8d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align-3.cfg
index 1b46c840..1b46c840 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align-4.cfg
index 1d35c349..1d35c349 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_attr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_attr.cfg
index 3249cd7b..3249cd7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_attr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_attr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_func_proto_star_amp-1.cfg
index 83874b8b..83874b8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_func_proto_star_amp-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_func_proto_star_amp-2.cfg
index 3afaa70a..3afaa70a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_func_proto_star_amp-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_func_proto_star_amp-3.cfg
index 1b1e7541..1b1e7541 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_func_proto_star_amp-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_func_proto_star_amp-4.cfg
index 391526e0..391526e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_func_proto_star_amp-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_func_proto_star_amp-5.cfg
index 7fd9cd6c..7fd9cd6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_func_proto_star_amp-5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_func_proto_star_amp-6.cfg
index 00d18433..00d18433 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-6.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_func_proto_star_amp-6.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-7.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_func_proto_star_amp-7.cfg
index 64af8258..64af8258 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-7.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_func_proto_star_amp-7.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_func_proto_star_amp-8.cfg
index 4531b895..4531b895 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-8.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_func_proto_star_amp-8.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-9.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_func_proto_star_amp-9.cfg
index 2b2b6b02..2b2b6b02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_func_proto_star_amp-9.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_func_proto_star_amp-9.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_keep_extra.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_keep_extra.cfg
index fcaab9f2..fcaab9f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_keep_extra.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_keep_extra.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_multi.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_multi.cfg
index 33b236d5..33b236d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_multi.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_multi.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_nl_cont-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_nl_cont-2.cfg
new file mode 100644
index 00000000..6401180b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_nl_cont-2.cfg
@@ -0,0 +1 @@
+align_nl_cont = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_nl_cont-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_nl_cont-3.cfg
new file mode 100644
index 00000000..31ec6899
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_nl_cont-3.cfg
@@ -0,0 +1 @@
+align_nl_cont = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_nl_cont_spaces-5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_nl_cont_spaces-5.cfg
new file mode 100644
index 00000000..0c46e8b6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_nl_cont_spaces-5.cfg
@@ -0,0 +1,2 @@
+align_nl_cont = 1
+align_nl_cont_spaces = 5
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_right_cmt_gap-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_right_cmt_gap-1.cfg
index 46aaf838..46aaf838 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_right_cmt_gap-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_right_cmt_gap-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_sf_call_span_418.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_sf_call_span_418.cfg
index cdf7f052..cdf7f052 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_sf_call_span_418.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_sf_call_span_418.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_sf_call_span_419.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_sf_call_span_419.cfg
index a11c2102..a11c2102 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_sf_call_span_419.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_sf_call_span_419.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_sf_call_thresh_416.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_sf_call_thresh_416.cfg
index 6280b856..6280b856 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_sf_call_thresh_416.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_sf_call_thresh_416.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_sf_call_thresh_417.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_sf_call_thresh_417.cfg
index 9d09abb2..9d09abb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_sf_call_thresh_417.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_sf_call_thresh_417.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_stack.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_stack.cfg
index d53a6bb3..d53a6bb3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_stack.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_stack.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_trailing_do_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_trailing_do_cmt.cfg
index bebd4c83..bebd4c83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_trailing_do_cmt.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_trailing_do_cmt.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_typedef_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_typedef_func-1.cfg
index ea45e4d8..ea45e4d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_typedef_func-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_typedef_func-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_typedef_func-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_typedef_func-2.cfg
index 252f07ea..252f07ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_typedef_func-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_typedef_func-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_typedef_gap-3_span-5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_typedef_gap-3_span-5.cfg
index 338f078f..338f078f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/align_typedef_gap-3_span-5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/align_typedef_gap-3_span-5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_047.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_047.cfg
index 2af44bb3..2af44bb3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_047.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_047.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_048.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_048.cfg
index 2d8e61ef..2d8e61ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_048.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_048.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_049.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_049.cfg
index 50a5b61c..93e4499c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_049.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_049.cfg
@@ -3,4 +3,4 @@ sp_after_comma                  = force
 indent_columns                  = 3
 indent_with_tabs                = 0
 pp_multiline_define_body_indent = 3
-align_nl_cont                   = true
+align_nl_cont                   = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_050.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_050.cfg
index 0f0e30ac..0f0e30ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_050.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_050.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_051.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_051.cfg
index 786fb030..786fb030 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_051.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_051.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_052.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_052.cfg
index ba150be7..ba150be7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_052.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_052.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_053.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_053.cfg
index a28d7dc2..a28d7dc2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_053.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_053.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_054.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_054.cfg
index 56661763..56661763 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_054.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_054.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_055.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_055.cfg
index f87a7f09..f87a7f09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_055.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_055.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_056.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_056.cfg
index fdf8230b..efd9e116 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_056.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_056.cfg
@@ -1,4 +1,4 @@
 indent_columns                  = 3
 pp_multiline_define_body_indent = 3
-align_nl_cont                   = true
+align_nl_cont                   = 1
 pp_space_after                  = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_057.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_057.cfg
index fbf24d72..fbf24d72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_057.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_057.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_058.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_058.cfg
index 60757d30..29ab494b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_058.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_058.cfg
@@ -6,5 +6,5 @@ indent_switch_body              = 3
 pp_multiline_define_body_indent = 3
 nl_switch_brace                 = add
 eat_blanks_before_close_brace   = true
-align_nl_cont                   = true
+align_nl_cont                   = 1
 mod_paren_on_return             = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_061.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_061.cfg
index 89f76fae..89f76fae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_061.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_061.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_063.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_063.cfg
index 91f0e92f..91f0e92f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_063.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_063.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_064.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_064.cfg
index f56efbdf..f56efbdf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_064.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_064.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_065.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_065.cfg
index 21d55b16..21d55b16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_065.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_065.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_069.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_069.cfg
index d42173e1..d42173e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_069.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_069.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_070.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_070.cfg
index f304ca8a..f304ca8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_070.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_070.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_071.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_071.cfg
index 869f2a94..869f2a94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_071.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_071.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_072.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_072.cfg
index e58fa4fc..5de1221d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_072.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_072.cfg
@@ -1,4 +1,4 @@
 indent_columns                  = 3
 pp_multiline_define_body_indent = 3
 eat_blanks_before_close_brace   = true
-align_nl_cont                   = true
+align_nl_cont                   = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_073.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_073.cfg
index fe9d6c05..fe9d6c05 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_073.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_073.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_074.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_074.cfg
index 31a1de44..31a1de44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_074.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_074.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_075.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_075.cfg
index 9eca8a9b..9eca8a9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_075.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_075.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_076.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_076.cfg
index fb27ba74..fb27ba74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_076.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_076.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_077.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_077.cfg
index 4e9760f7..4e9760f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_077.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_077.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_078.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_078.cfg
index 54fcc628..54fcc628 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_078.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_078.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_079.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_079.cfg
index 77a732e5..77a732e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_079.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_079.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_080.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_080.cfg
index 45e16a8d..45e16a8d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_080.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_080.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_081.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_081.cfg
index 630b3cbc..4d9db731 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_081.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_081.cfg
@@ -1,4 +1,4 @@
 sp_before_ellipsis              = remove
 indent_columns                  = 3
 pp_multiline_define_body_indent = 3
-align_nl_cont                   = true
+align_nl_cont                   = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_083.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_083.cfg
index 2bdf2afa..2bdf2afa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_083.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_083.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_084.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_084.cfg
index c770772c..c770772c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_084.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_084.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_085.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_085.cfg
new file mode 100644
index 00000000..ca86d2f4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_085.cfg
@@ -0,0 +1,4 @@
+sp_paren_paren   = remove
+sp_inside_fparen = remove
+sp_inside_rparen = remove
+indent_columns   = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_086.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_086.cfg
index 7ffcd831..7ffcd831 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_086.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_086.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_087.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_087.cfg
index 5b5592a7..5b5592a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_087.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_087.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_088.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_088.cfg
index a8abed32..a8abed32 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_088.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_088.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_089.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_089.cfg
index d3c152df..d3c152df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_089.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_089.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_090.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_090.cfg
index 340afec1..dabddf2a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_090.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_090.cfg
@@ -1,3 +1,3 @@
 indent_columns                  = 3
 pp_multiline_define_body_indent = 3
-align_nl_cont                   = true
+align_nl_cont                   = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_091.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_091.cfg
index aec90af1..aec90af1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_091.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_091.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_092.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_092.cfg
index bb993d75..bb993d75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_092.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_092.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_093.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_093.cfg
index 4e50b52b..4e50b52b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_093.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_093.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_094.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_094.cfg
index 5ff0a09b..5ff0a09b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_094.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_094.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_095.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_095.cfg
index edb10a4f..edb10a4f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ben_095.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ben_095.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bool-pos-eol-break.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/bool-pos-eol-break.cfg
index d2abdeb6..d2abdeb6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bool-pos-eol-break.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/bool-pos-eol-break.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bool-pos-eol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/bool-pos-eol.cfg
index f7fe1330..f7fe1330 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bool-pos-eol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/bool-pos-eol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bool-pos-sol-break.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/bool-pos-sol-break.cfg
index e07ab7e9..e07ab7e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bool-pos-sol-break.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/bool-pos-sol-break.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bool-pos-sol-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/bool-pos-sol-force.cfg
index 36f81a26..36f81a26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bool-pos-sol-force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/bool-pos-sol-force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bool-pos-sol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/bool-pos-sol.cfg
index 9dbcbaf2..9dbcbaf2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bool-pos-sol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/bool-pos-sol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-banner.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/brace-banner.cfg
index 2fc753a6..78417cf8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-banner.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/brace-banner.cfg
@@ -1,4 +1,5 @@
 #  Banner style
+sp_sparen_brace                 = add
 output_tab_size                 = 2
 sp_fparen_brace                 = add
 sp_else_brace                   = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-banner.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/brace-banner.rerun.cfg
index df289545..df289545 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-banner.rerun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/brace-banner.rerun.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-gnu.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/brace-gnu.cfg
index c5bd1371..c5bd1371 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-gnu.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/brace-gnu.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-kr-br.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/brace-kr-br.cfg
index 59bc4084..0ea2f9bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-kr-br.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/brace-kr-br.cfg
@@ -1,4 +1,5 @@
 #  K&R style
+sp_sparen_brace                 = add
 sp_else_brace                   = force
 nl_if_brace                     = remove
 nl_after_brace_open             = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-kr-nobr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/brace-kr-nobr.cfg
index 970b1ab0..970b1ab0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-kr-nobr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/brace-kr-nobr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-kr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/brace-kr.cfg
index 7ef5aa16..b655443c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-kr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/brace-kr.cfg
@@ -1,4 +1,5 @@
 #  K&R style
+sp_sparen_brace                 = add
 sp_else_brace                   = force
 sp_brace_else                   = force
 sp_do_brace_open                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-remove-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/brace-remove-2.cfg
index 9aa693fc..9aa693fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-remove-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/brace-remove-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-remove-all.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/brace-remove-all.cfg
index ca279abd..ca279abd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-remove-all.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/brace-remove-all.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-ws.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/brace-ws.cfg
index 76d8908a..76d8908a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-ws.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/brace-ws.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-ws2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/brace-ws2.cfg
index 55eb6ece..55eb6ece 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/brace-ws2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/brace-ws2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bug_1702.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/bug_1702.cfg
index 1c415eec..1c415eec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bug_1702.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/bug_1702.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bug_1718.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/bug_1718.cfg
index e55de095..e55de095 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bug_1718.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/bug_1718.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bug_2331.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/bug_2331.cfg
index 4a4af2f3..4a4af2f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bug_2331.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/bug_2331.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bug_489.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/bug_489.cfg
index 61d4693c..61d4693c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bug_489.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/bug_489.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bug_i_771.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/bug_i_771.cfg
index 69b6e1a3..69b6e1a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/bug_i_771.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/bug_i_771.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/case-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/case-1.cfg
index 7c65a819..7c65a819 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/case-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/case-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/case-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/case-2.cfg
index 07c0566d..07c0566d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/case-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/case-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/case-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/case-3.cfg
index 74f16293..74f16293 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/case-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/case-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cast-sp-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cast-sp-a.cfg
index 488198a9..488198a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cast-sp-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cast-sp-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cast-sp-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cast-sp-r.cfg
index 1d0138a2..1d0138a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cast-sp-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cast-sp-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cast-type.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cast-type.cfg
index 5900ffd5..5900ffd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cast-type.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cast-type.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cgal.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cgal.cfg
index a4ec1fa0..a4ec1fa0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cgal.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cgal.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/clang-has_include.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/clang-has_include.cfg
index db006d08..db006d08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/clang-has_include.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/clang-has_include.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cmt_indent_multi-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cmt_indent_multi-f.cfg
index 1bd265a3..1bd265a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cmt_indent_multi-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cmt_indent_multi-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cmt_multi_check_last-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cmt_multi_check_last-f.cfg
index 7fdebde0..7fdebde0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cmt_multi_check_last-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cmt_multi_check_last-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cmt_nl_end.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cmt_nl_end.cfg
index 1c0b396a..1c0b396a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cmt_nl_end.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cmt_nl_end.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cmt_reflow.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cmt_reflow.cfg
index 9b280d18..9b280d18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cmt_reflow.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cmt_reflow.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/code_width-80.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/code_width-80.cfg
index 4bdb0ce7..4bdb0ce7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/code_width-80.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/code_width-80.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/comment_conversion.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/comment_conversion.cfg
new file mode 100644
index 00000000..96b4bf4e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/comment_conversion.cfg
@@ -0,0 +1,2 @@
+cmt_trailing_single_line_c_to_cpp = true
+cmt_width                         = 100
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cond-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cond-1.cfg
index 61669da9..61669da9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cond-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cond-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/convert_cmt_vbrace_one_line.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/convert_cmt_vbrace_one_line.cfg
index dc5a6d92..38a2ca92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/convert_cmt_vbrace_one_line.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/convert_cmt_vbrace_one_line.cfg
@@ -1,3 +1,4 @@
+sp_sparen_brace        = add
 mod_full_brace_if      = add
 nl_after_brace_open    = true
 nl_if_leave_one_liners = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cpp_to_c-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cpp_to_c-1.cfg
index b5b95435..b5b95435 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cpp_to_c-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cpp_to_c-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cpp_to_c-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cpp_to_c-2.cfg
index 9f0d9e3a..9f0d9e3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cpp_to_c-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cpp_to_c-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cpp_to_c-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cpp_to_c-3.cfg
index 20bbb9e1..20bbb9e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/cpp_to_c-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/cpp_to_c-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/custom_types_ssl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/custom_types_ssl.cfg
index 4005234e..4005234e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/custom_types_ssl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/custom_types_ssl.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/doxy-comment-no.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/doxy-comment-no.cfg
index bd2bd258..bd2bd258 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/doxy-comment-no.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/doxy-comment-no.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/doxy-comment-yes.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/doxy-comment-yes.cfg
index bc1d5584..bc1d5584 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/doxy-comment-yes.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/doxy-comment-yes.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/else-if-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/else-if-1.cfg
index b4e4aecb..b4e4aecb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/else-if-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/else-if-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/else-if-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/else-if-2.cfg
index 75d7936e..75d7936e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/else-if-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/else-if-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/empty_body.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/empty_body.cfg
index b737dfd8..b737dfd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/empty_body.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/empty_body.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/endif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/endif.cfg
index ff69251b..ff69251b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/endif.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/endif.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/enum_comma_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/enum_comma_ifdef.cfg
index a2622767..a2622767 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/enum_comma_ifdef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/enum_comma_ifdef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/force_tab_after_define-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/force_tab_after_define-t.cfg
index 67b04e78..67b04e78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/force_tab_after_define-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/force_tab_after_define-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/freebsd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/freebsd.cfg
index 725b00b0..c0845eca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/freebsd.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/freebsd.cfg
@@ -1,3 +1,4 @@
+sp_sparen_brace                 = add
 sp_arith                        = force
 sp_bool                         = force
 sp_before_ptr_star              = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/func_call_user.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/func_call_user.cfg
index 504fb3d8..504fb3d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/func_call_user.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/func_call_user.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ger.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ger.cfg
index 268a4f19..268a4f19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ger.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ger.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/i1564.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/i1564.cfg
index 74c53e52..74c53e52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/i1564.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/i1564.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/if_chain.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/if_chain.cfg
index d3449cc5..659ec26e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/if_chain.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/if_chain.cfg
@@ -1,3 +1,4 @@
+sp_after_sparen                 = add
 sp_before_sparen                = force
 sp_inside_sparen                = remove
 sp_else_brace                   = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent-1.cfg
index 943d0eb6..943d0eb6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent-vbrace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent-vbrace.cfg
index 7e6ca7c1..7e6ca7c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent-vbrace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent-vbrace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_assign.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_assign.cfg
index 6bad61f1..6bad61f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_assign.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_assign.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_case_comment-false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_case_comment-false.cfg
index 15e0e2e8..15e0e2e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_case_comment-false.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_case_comment-false.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_case_comment-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_case_comment-true.cfg
index abcadd59..abcadd59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_case_comment-true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_case_comment-true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_comment_align_thresh-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_comment_align_thresh-0.cfg
index dc730bf8..dc730bf8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_comment_align_thresh-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_comment_align_thresh-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_compound_literal_return-false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_compound_literal_return-false.cfg
index b686aabe..b686aabe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_compound_literal_return-false.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_compound_literal_return-false.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_compound_literal_return-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_compound_literal_return-true.cfg
index 9fa1d2ef..9fa1d2ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_compound_literal_return-true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_compound_literal_return-true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_func_call_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_func_call_param.cfg
index 26b4e03a..26b4e03a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_func_call_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_func_call_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_func_def_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_func_def_param.cfg
index c448b21f..c448b21f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_func_def_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_func_def_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_func_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_func_param.cfg
index 7db464b4..7db464b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_func_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_func_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_func_proto_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_func_proto_param.cfg
index 6cfb83ed..6cfb83ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_func_proto_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_func_proto_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_ignore_bool-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_ignore_bool-true.cfg
index 0f952471..0f952471 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_ignore_bool-true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_ignore_bool-true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_macro_brace-false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_macro_brace-false.cfg
index f9e3bdca..f9e3bdca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_macro_brace-false.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_macro_brace-false.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_macro_brace-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_macro_brace-true.cfg
index 62573cad..62573cad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_macro_brace-true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_macro_brace-true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_paren_close--1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_paren_close--1.cfg
index 0656a55f..0656a55f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_paren_close--1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_paren_close--1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_paren_close-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_paren_close-1.cfg
index e380b281..e380b281 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_paren_close-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_paren_close-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_paren_close-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_paren_close-2.cfg
index 2a77fedf..2a77fedf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_paren_close-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_paren_close-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_single_line_comments_after.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_single_line_comments_after.cfg
index bae9787c..bae9787c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_single_line_comments_after.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_single_line_comments_after.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_sparen_extra-8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_sparen_extra-8.cfg
index 6344ceb2..6344ceb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/indent_sparen_extra-8.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/indent_sparen_extra-8.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/issue_527.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/issue_527.cfg
index cb63239a..166fffec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/issue_527.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/issue_527.cfg
@@ -144,7 +144,7 @@ align_typedef_star_style      = 0
 align_typedef_amp_style       = 0

 align_right_cmt_span          = 0

 align_func_proto_span         = 0

-align_nl_cont                 = false

+align_nl_cont                 = 0

 align_pp_define_gap           = 0

 align_pp_define_span          = 0

 nl_collapse_empty_body        = false

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/label_colon_nl_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/label_colon_nl_1.cfg
new file mode 100644
index 00000000..68402fd0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/label_colon_nl_1.cfg
@@ -0,0 +1,8 @@
+sp_sparen_brace          = add
+sp_after_bit_colon       = force
+sp_before_bit_colon      = force
+nl_before_case           = true
+nl_after_semicolon       = true
+nl_after_label_colon     = true
+nl_remove_extra_newlines = 2
+align_var_struct_span    = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/label_colon_nl_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/label_colon_nl_2.cfg
new file mode 100644
index 00000000..eccbdec2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/label_colon_nl_2.cfg
@@ -0,0 +1,7 @@
+sp_sparen_brace          = add
+sp_after_bit_colon       = force
+sp_before_bit_colon      = force
+nl_before_case           = true
+nl_after_semicolon       = true
+nl_remove_extra_newlines = 2
+align_var_struct_span    = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/leave_one_liners.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/leave_one_liners.cfg
index 931e9465..931e9465 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/leave_one_liners.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/leave_one_liners.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod-paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod-paren.cfg
index 2c0049ab..2c0049ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod-paren.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod-paren.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod-paren2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod-paren2.cfg
index 113ee868..113ee868 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod-paren2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod-paren2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_case_brace_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_case_brace_add.cfg
index bfcca51a..bfcca51a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_case_brace_add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_case_brace_add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_infinite_loop-0.cfg
index 52428063..52428063 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_infinite_loop-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_infinite_loop-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_infinite_loop-1.cfg
new file mode 100644
index 00000000..8b4dd7f9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_infinite_loop-1.cfg
@@ -0,0 +1,2 @@
+sp_after_sparen   = force
+mod_infinite_loop = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_infinite_loop-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_infinite_loop-2.cfg
new file mode 100644
index 00000000..80fdae95
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_infinite_loop-2.cfg
@@ -0,0 +1,2 @@
+sp_after_sparen   = add
+mod_infinite_loop = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_infinite_loop-3.cfg
index b026525b..b026525b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_infinite_loop-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_infinite_loop-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_infinite_loop-4.cfg
new file mode 100644
index 00000000..05fe0cd6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_infinite_loop-4.cfg
@@ -0,0 +1,2 @@
+sp_after_sparen   = force
+mod_infinite_loop = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_infinite_loop-5.cfg
index 4b127892..4b127892 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_infinite_loop-5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_infinite_loop-5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-add-all-prefer-left.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int-add-all-prefer-left.cfg
index 2f0fd00d..2f0fd00d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-add-all-prefer-left.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int-add-all-prefer-left.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-add-all-prefer-right.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int-add-all-prefer-right.cfg
index 35b3d317..35b3d317 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-add-all-prefer-right.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int-add-all-prefer-right.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-remove-all.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int-remove-all.cfg
index d072c2f4..d072c2f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-remove-all.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int-remove-all.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-remove-left.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int-remove-left.cfg
index b2396016..b2396016 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-remove-left.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int-remove-left.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-remove-right.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int-remove-right.cfg
index aa16c67c..aa16c67c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-remove-right.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int-remove-right.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-shift-left.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int-shift-left.cfg
index 4db8af41..4db8af41 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-shift-left.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int-shift-left.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-shift-right.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int-shift-right.cfg
index 78c5806b..78c5806b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int-shift-right.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int-shift-right.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_long-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int_long-a.cfg
index c8cd7a2c..c8cd7a2c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_long-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int_long-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_long-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int_long-r.cfg
index 2f499ac8..2f499ac8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_long-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int_long-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_short-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int_short-a.cfg
index 94ca506b..94ca506b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_short-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int_short-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_short-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int_short-r.cfg
index e6458b57..e6458b57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_short-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int_short-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_signed-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int_signed-a.cfg
index f2ad55d3..f2ad55d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_signed-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int_signed-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_signed-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int_signed-r.cfg
index 7e418238..7e418238 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_signed-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int_signed-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_unsigned-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int_unsigned-a.cfg
index fcafcddc..fcafcddc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_unsigned-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int_unsigned-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_unsigned-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int_unsigned-r.cfg
index cef8d459..cef8d459 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_int_unsigned-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_int_unsigned-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_long_int-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_long_int-a.cfg
index c3ac76dd..c3ac76dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_long_int-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_long_int-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_long_int-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_long_int-r.cfg
index 15a40e52..15a40e52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_long_int-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_long_int-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_move_case_brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_move_case_brace.cfg
index acb25734..acb25734 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_move_case_brace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_move_case_brace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_move_case_return.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_move_case_return.cfg
index 0e698ea9..0e698ea9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_move_case_return.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_move_case_return.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_short_int-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_short_int-a.cfg
index d6986aa1..d6986aa1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_short_int-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_short_int-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_short_int-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_short_int-r.cfg
index 53daa53f..53daa53f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_short_int-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_short_int-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_signed_int-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_signed_int-a.cfg
index e951d8e7..e951d8e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_signed_int-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_signed_int-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_signed_int-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_signed_int-r.cfg
index aa70348d..aa70348d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_signed_int-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_signed_int-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_unsigned_int-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_unsigned_int-a.cfg
index 7141c9cf..7141c9cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_unsigned_int-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_unsigned_int-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_unsigned_int-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_unsigned_int-r.cfg
index 06f93143..06f93143 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/mod_unsigned_int-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/mod_unsigned_int-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/my_conf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/my_conf.cfg
index 6bfddbb5..9f23ca92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/my_conf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/my_conf.cfg
@@ -1,3 +1,4 @@
+sp_sparen_brace                 = add

 sp_assign                       = add

 sp_before_sparen                = add

 sp_inside_sparen                = remove

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nepenthes.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nepenthes.cfg
index 150294da..150294da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nepenthes.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nepenthes.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/newline_after_endif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/newline_after_endif.cfg
index afd7693d..afd7693d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/newline_after_endif.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/newline_after_endif.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl-comment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl-comment.cfg
index 0d1e2a11..0d1e2a11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl-comment.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl-comment.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_assign1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_assign1.cfg
index 1f4da850..1f4da850 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_assign1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_assign1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_assign2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_assign2.cfg
index b4cfb4d1..b4cfb4d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_assign2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_assign2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_before_return_false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_before_return_false.cfg
index 7636745b..7636745b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_before_return_false.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_before_return_false.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_before_return_true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_before_return_true.cfg
index 1e6976fc..1e6976fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_before_return_true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_before_return_true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_brace_test.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_brace_test.cfg
index 0d3f7109..0d3f7109 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_brace_test.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_brace_test.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_collapse_empty_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_collapse_empty_1.cfg
index e480c46c..c24e35b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_collapse_empty_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_collapse_empty_1.cfg
@@ -1,2 +1,3 @@
+sp_sparen_brace = add
 nl_collapse_empty_body = false
 nl_collapse_empty_body_functions = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_collapse_empty_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_collapse_empty_2.cfg
index e7313c5f..03137e3d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_collapse_empty_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_collapse_empty_2.cfg
@@ -1,2 +1,3 @@
+sp_sparen_brace = add
 nl_collapse_empty_body = true
 nl_collapse_empty_body_functions = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_collapse_empty_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_collapse_empty_3.cfg
index b0e47279..8dcbcb2d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_collapse_empty_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_collapse_empty_3.cfg
@@ -1,2 +1,3 @@
+sp_sparen_brace = add
 nl_collapse_empty_body = false
 nl_collapse_empty_body_functions = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_collapse_empty_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_collapse_empty_4.cfg
index 3d58e483..ca27b7dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_collapse_empty_4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_collapse_empty_4.cfg
@@ -1,2 +1,3 @@
+sp_sparen_brace = add
 nl_collapse_empty_body = true
 nl_collapse_empty_body_functions = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_create_one_liner.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_create_one_liner.cfg
index ec8b120c..8726c6ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_create_one_liner.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_create_one_liner.cfg
@@ -1,3 +1,4 @@
+sp_after_sparen                 = add
 indent_columns                  = 3
 nl_create_if_one_liner          = true
 nl_create_for_one_liner         = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_ds_struct_enum-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_ds_struct_enum-2.cfg
index 01c60de4..01c60de4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_ds_struct_enum-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_ds_struct_enum-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_ds_struct_enum_cmt-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_ds_struct_enum_cmt-t.cfg
index 1864b51d..1864b51d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_ds_struct_enum_cmt-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_ds_struct_enum_cmt-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_endif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_endif.cfg
index b056153e..b056153e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_endif.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_endif.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_enum_own_lines-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_enum_own_lines-3.cfg
index b6a28869..b6a28869 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_enum_own_lines-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_enum_own_lines-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_enum_own_lines-3.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_enum_own_lines-3.rerun.cfg
index f0d3f7b2..f0d3f7b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_enum_own_lines-3.rerun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_enum_own_lines-3.rerun.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_enum_own_lines-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_enum_own_lines-4.cfg
index 70973ec8..70973ec8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_enum_own_lines-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_enum_own_lines-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_enum_own_lines-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_enum_own_lines-a.cfg
index 66e7dbfa..66e7dbfa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_enum_own_lines-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_enum_own_lines-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_func_call-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_func_call-1.cfg
index e3befa10..e3befa10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_func_call-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_func_call-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_func_call-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_func_call-2.cfg
index 7b366b5b..7b366b5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_func_call-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_func_call-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_func_call-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_func_call-3.cfg
index 44c64753..44c64753 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_func_call-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_func_call-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_func_call-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_func_call-4.cfg
index af273843..af273843 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_func_call-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_func_call-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_func_call-5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_func_call-5.cfg
index 6e5553c0..6e5553c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_func_call-5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_func_call-5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_semicolon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_semicolon.cfg
index d099e0c7..d099e0c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_semicolon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_semicolon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_whole_file_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_whole_file_ifdef.cfg
index 1d6a585a..1d6a585a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/nl_whole_file_ifdef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/nl_whole_file_ifdef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pascal_ptr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pascal_ptr.cfg
index 1760abca..1760abca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pascal_ptr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pascal_ptr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pos_compare-eol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pos_compare-eol.cfg
index 90267209..90267209 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pos_compare-eol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pos_compare-eol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pos_compare-sol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pos_compare-sol.cfg
index a4235d7d..a4235d7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pos_compare-sol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pos_compare-sol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pos_conditional-l.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pos_conditional-l.cfg
index 11eb46fd..11eb46fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pos_conditional-l.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pos_conditional-l.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pos_conditional-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pos_conditional-t.cfg
index 79bb52d0..79bb52d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pos_conditional-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pos_conditional-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp-indent-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp-indent-2.cfg
index 1387ccfe..1387ccfe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp-indent-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp-indent-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp-space.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp-space.cfg
index e91685ab..e91685ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp-space.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp-space.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_if_indent-0.cfg
index 82f11f27..82f11f27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_if_indent-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_if_indent-1.cfg
index 7c01e819..7c01e819 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_if_indent-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_if_indent-2.cfg
index 6f912806..6f912806 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_if_indent-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_if_indent-3.cfg
index 4b876498..4b876498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_if_indent-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_if_indent-4.cfg
index fe29f734..fe29f734 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_if_indent-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent_code-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_if_indent_code-true.cfg
index cb00f671..cb00f671 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_if_indent_code-true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_if_indent_code-true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_include_at_level-false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_include_at_level-false.cfg
index 6f780147..6f780147 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_include_at_level-false.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_include_at_level-false.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_include_at_level-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_include_at_level-true.cfg
index bc062b9f..bc062b9f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_include_at_level-true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_include_at_level-true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_indent-a.cfg
index f9f9b3b3..f9f9b3b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_indent-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_brace--1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_indent_brace--1.cfg
index ecd054cb..ecd054cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_brace--1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_indent_brace--1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_in_guard.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_indent_in_guard.cfg
index 2c4e2545..2c4e2545 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_in_guard.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_indent_in_guard.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_with_tabs_-1_0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_indent_with_tabs_-1_0.cfg
index 7e50c5a8..7e50c5a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_with_tabs_-1_0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_indent_with_tabs_-1_0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_with_tabs_-1_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_indent_with_tabs_-1_1.cfg
index c3daa492..c3daa492 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_with_tabs_-1_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_indent_with_tabs_-1_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_with_tabs_-1_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_indent_with_tabs_-1_2.cfg
index bb793d00..bb793d00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_with_tabs_-1_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_indent_with_tabs_-1_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_with_tabs_0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_indent_with_tabs_0.cfg
index 85aa06bc..85aa06bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_with_tabs_0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_indent_with_tabs_0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_with_tabs_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_indent_with_tabs_1.cfg
index 4a798a12..4a798a12 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_with_tabs_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_indent_with_tabs_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_with_tabs_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_indent_with_tabs_2.cfg
index 11c06aa2..11c06aa2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_indent_with_tabs_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_indent_with_tabs_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_multiline_define_align_nl.cfg
index 549e031f..e0e639e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_nl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_multiline_define_align_nl.cfg
@@ -1,5 +1,6 @@
+sp_sparen_brace       = add
 input_tab_size        = 2
 output_tab_size       = 2
 indent_columns        = 2
 pp_indent_with_tabs   = 0
-align_nl_cont         = true
+align_nl_cont         = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_cnt3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_multiline_define_align_pp_cnt3.cfg
index 70b1a6b4..32b1a98b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_cnt3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_multiline_define_align_pp_cnt3.cfg
@@ -1,7 +1,8 @@
+sp_sparen_brace       = add
 input_tab_size        = 2
 output_tab_size       = 2
 indent_columns        = 2
 pp_indent_with_tabs   = 0
 pp_indent_count       = 3
 pp_indent             = force
-align_nl_cont         = true
+align_nl_cont         = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_col1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_multiline_define_align_pp_col1.cfg
index fe6b63c7..14def669 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_col1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_multiline_define_align_pp_col1.cfg
@@ -1,7 +1,8 @@
+sp_sparen_brace       = add
 input_tab_size        = 2
 output_tab_size       = 2
 indent_columns        = 2
 pp_indent_with_tabs   = 0
 pp_indent_count       = 0
 pp_indent             = force
-align_nl_cont         = true
+align_nl_cont         = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_ml-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_multiline_define_align_pp_ml-1.cfg
index 20526ce9..1154702c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_ml-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_multiline_define_align_pp_ml-1.cfg
@@ -1,3 +1,4 @@
+sp_sparen_brace                 = add
 input_tab_size                  = 2
 output_tab_size                 = 2
 indent_columns                  = 2
@@ -5,4 +6,4 @@ pp_indent_with_tabs             = 0
 pp_indent_count                 = 2
 pp_multiline_define_body_indent = -1
 pp_indent                       = force
-align_nl_cont                   = true
+align_nl_cont                   = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_ml-5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_multiline_define_align_pp_ml-5.cfg
index d09a083d..e77ffa65 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_ml-5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_multiline_define_align_pp_ml-5.cfg
@@ -1,3 +1,4 @@
+sp_sparen_brace                 = add
 input_tab_size                  = 2
 output_tab_size                 = 2
 indent_columns                  = 2
@@ -5,4 +6,4 @@ pp_indent_with_tabs             = 0
 pp_indent_count                 = 2
 pp_multiline_define_body_indent = -5
 pp_indent                       = force
-align_nl_cont                   = true
+align_nl_cont                   = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_ml0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_multiline_define_align_pp_ml0.cfg
index 694bdca5..75d73d46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_ml0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_multiline_define_align_pp_ml0.cfg
@@ -1,3 +1,4 @@
+sp_sparen_brace                 = add
 input_tab_size                  = 2
 output_tab_size                 = 2
 indent_columns                  = 2
@@ -5,4 +6,4 @@ pp_indent_with_tabs             = 0
 pp_indent_count                 = 2
 pp_multiline_define_body_indent = 0
 pp_indent                       = force
-align_nl_cont                   = true
+align_nl_cont                   = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_ml2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_multiline_define_align_pp_ml2.cfg
index 6a55e5b9..a3cc63be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_ml2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_multiline_define_align_pp_ml2.cfg
@@ -1,3 +1,4 @@
+sp_sparen_brace                 = add
 input_tab_size                  = 2
 output_tab_size                 = 2
 indent_columns                  = 2
@@ -5,4 +6,4 @@ pp_indent_with_tabs             = 0
 pp_indent_count                 = 2
 pp_multiline_define_body_indent = 2
 pp_indent                       = force
-align_nl_cont                   = true
+align_nl_cont                   = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_ml4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_multiline_define_align_pp_ml4.cfg
index 2206a130..19ae0849 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_align_pp_ml4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_multiline_define_align_pp_ml4.cfg
@@ -1,3 +1,4 @@
+sp_sparen_brace                 = add
 input_tab_size                  = 2
 output_tab_size                 = 2
 indent_columns                  = 2
@@ -5,4 +6,4 @@ pp_indent_with_tabs             = 0
 pp_indent_count                 = 2
 pp_multiline_define_body_indent = 4
 pp_indent                       = force
-align_nl_cont                   = true
+align_nl_cont                   = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_ignore_body.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_multiline_define_ignore_body.cfg
index ad3114b8..ad3114b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_ignore_body.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_multiline_define_ignore_body.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_with_spaces.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_multiline_define_with_spaces.cfg
index 1b4c74ab..d8100e67 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_multiline_define_with_spaces.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_multiline_define_with_spaces.cfg
@@ -1,3 +1,4 @@
+sp_sparen_brace       = add
 input_tab_size        = 2
 output_tab_size       = 2
 indent_columns        = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_ret.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_ret.cfg
index b1fb2000..b1fb2000 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_ret.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_ret.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_space_after.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_space_after.cfg
index 9bc1026a..9bc1026a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_space_after.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_space_after.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_space_before.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_space_before.cfg
index e26fbfe4..e26fbfe4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_space_before.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_space_before.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_space_before_after.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_space_before_after.cfg
index 94765577..94765577 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_space_before_after.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_space_before_after.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_space_none.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_space_none.cfg
index 5287a565..5287a565 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/pp_space_none.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/pp_space_none.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/preproc-cleanup.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/preproc-cleanup.cfg
index 4773d091..4773d091 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/preproc-cleanup.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/preproc-cleanup.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ptr-arith.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ptr-arith.cfg
index ff1949d3..ff1949d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/ptr-arith.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/ptr-arith.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/rdan.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/rdan.cfg
index 1c1b0c68..1c1b0c68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/rdan.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/rdan.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/return-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/return-1.cfg
index 996ca632..996ca632 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/return-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/return-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/return-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/return-2.cfg
index 87b361d8..87b361d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/return-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/return-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/return-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/return-3.cfg
index 9caf1a7e..9caf1a7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/return-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/return-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/return-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/return-4.cfg
index 9a885287..9a885287 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/return-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/return-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sf537.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sf537.cfg
index 400c7e0b..400c7e0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sf537.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sf537.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sf538.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sf538.cfg
index 8c6d149b..8c6d149b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sf538.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sf538.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_after_pointer_star-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_after_pointer_star-r.cfg
index 92a637a1..92a637a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_after_pointer_star-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_after_pointer_star-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_after_sparen-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_after_sparen-a.cfg
new file mode 100644
index 00000000..bf498a46
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_after_sparen-a.cfg
@@ -0,0 +1 @@
+sp_after_sparen = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_after_sparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_after_sparen-f.cfg
new file mode 100644
index 00000000..579e9270
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_after_sparen-f.cfg
@@ -0,0 +1 @@
+sp_after_sparen = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_after_sparen-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_after_sparen-i.cfg
new file mode 100644
index 00000000..3bbe318b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_after_sparen-i.cfg
@@ -0,0 +1 @@
+sp_after_sparen = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_after_sparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_after_sparen-r.cfg
new file mode 100644
index 00000000..a4223a72
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_after_sparen-r.cfg
@@ -0,0 +1 @@
+sp_after_sparen = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_between_semi_for_empty-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_between_semi_for_empty-i.cfg
index 146f6d61..146f6d61 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_between_semi_for_empty-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_between_semi_for_empty-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_between_semi_for_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_between_semi_for_empty-r.cfg
index 26dcc001..26dcc001 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_between_semi_for_empty-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_between_semi_for_empty-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_cmt_cpp_start-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_cmt_cpp_start-r.cfg
index 13ceebfc..13ceebfc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_cmt_cpp_start-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_cmt_cpp_start-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_cond_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_cond_colon.cfg
index d39afa14..d39afa14 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_cond_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_cond_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_emb_cmt-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_emb_cmt-f.cfg
index 68a83e91..68a83e91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_emb_cmt-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_emb_cmt-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_emb_cmt-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_emb_cmt-i.cfg
index 04f49ee7..04f49ee7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_emb_cmt-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_emb_cmt-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_emb_cmt-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_emb_cmt-r.cfg
index f45d357b..f45d357b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_emb_cmt-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_emb_cmt-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_enum_brace-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_enum_brace-a.cfg
index ada72096..ada72096 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_enum_brace-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_enum_brace-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_enum_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_enum_brace-f.cfg
index 0e358549..0e358549 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_enum_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_enum_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_enum_brace-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_enum_brace-i.cfg
index f18a88b3..f18a88b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_enum_brace-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_enum_brace-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_enum_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_enum_brace-r.cfg
index 22785029..22785029 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_enum_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_enum_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_func_call_user_inside_fparen.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_func_call_user_inside_fparen.cfg
index e5650760..e5650760 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_func_call_user_inside_fparen.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_func_call_user_inside_fparen.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_ptr_star_func_var-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_ptr_star_func_var-a.cfg
index a21ed3da..a21ed3da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_ptr_star_func_var-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_ptr_star_func_var-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_ptr_star_func_var-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_ptr_star_func_var-f.cfg
index 9562f157..9562f157 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_ptr_star_func_var-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_ptr_star_func_var-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_ptr_star_func_var-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_ptr_star_func_var-i.cfg
index e18cc959..e18cc959 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_ptr_star_func_var-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_ptr_star_func_var-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_ptr_star_func_var-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_ptr_star_func_var-r.cfg
index ec9bf9c0..ec9bf9c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_ptr_star_func_var-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_ptr_star_func_var-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_sparen_paren-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_sparen_paren-a.cfg
index 0d477f4d..0d477f4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_sparen_paren-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_sparen_paren-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_sparen_paren-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_sparen_paren-i.cfg
index 750b77ff..750b77ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_sparen_paren-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/sp_sparen_paren-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/space_indent_columns-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/space_indent_columns-3.cfg
index ec130371..ec130371 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/space_indent_columns-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/space_indent_columns-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/star-style-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/star-style-0.cfg
index dd69e7f8..dd69e7f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/star-style-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/star-style-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/star-style-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/star-style-1.cfg
index 842dc820..842dc820 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/star-style-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/star-style-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/star-style-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/star-style-2.cfg
index 0165f975..0165f975 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/star-style-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/star-style-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/type_wrap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/type_wrap.cfg
index eeea5786..eeea5786 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/type_wrap.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/type_wrap.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/width-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/width-3.cfg
index 843f6669..309db151 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/width-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/width-3.cfg
@@ -1,4 +1,5 @@
 # width stuff
+sp_sparen_brace                 = add
 sp_arith                        = force
 indent_columns                  = 4
 indent_with_tabs                = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/width.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/width.cfg
index 10cb731c..3245a35e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/width.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/width.cfg
@@ -1,4 +1,5 @@
 # width stuff
+sp_sparen_brace                 = add
 sp_arith                        = force
 indent_columns                  = 4
 indent_with_tabs                = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/xml-str.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/xml-str.cfg
index bd667ab4..bd667ab4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/xml-str.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/c/xml-str.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/Issue_3052.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/Issue_3052.cfg
index f7c29b8e..f7c29b8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/Issue_3052.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/Issue_3052.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/UNI-18777.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/UNI-18777.cfg
index 7d4c013e..7d4c013e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/UNI-18777.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/UNI-18777.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/aet-func_call_user.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/aet-func_call_user.cfg
index 3219bc4b..3219bc4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/aet-func_call_user.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/aet-func_call_user.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/aet-func_def.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/aet-func_def.cfg
index c4575b88..c4575b88 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/aet-func_def.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/aet-func_def.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/aet-sp_after_oc_msg_receiver.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/aet-sp_after_oc_msg_receiver.cfg
index 8e25aaed..8e25aaed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/aet-sp_after_oc_msg_receiver.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/aet-sp_after_oc_msg_receiver.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/aet-sp_inside_braces_oc_dict.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/aet-sp_inside_braces_oc_dict.cfg
index 57e2463e..57e2463e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/aet-sp_inside_braces_oc_dict.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/aet-sp_inside_braces_oc_dict.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/aet.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/aet.cfg
index 170c9488..69f104cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/aet.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/aet.cfg
@@ -290,7 +290,7 @@ align_single_line_func                               = false
 align_single_line_brace                              = false
 align_single_line_brace_gap                          = 0
 align_oc_msg_spec_span                               = 0
-align_nl_cont                                        = false
+align_nl_cont                                        = 0
 align_pp_define_together                             = false
 align_pp_define_gap                                  = 0
 align_pp_define_span                                 = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/align-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/align-1.cfg
index 720f003e..720f003e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/align-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/align-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/align_same_func_call_params-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/align_same_func_call_params-t.cfg
index d1496108..d1496108 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/align_same_func_call_params-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/align_same_func_call_params-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/attribute_specifier_seqs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/attribute_specifier_seqs.cfg
index 3a7f6096..3a7f6096 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/attribute_specifier_seqs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/attribute_specifier_seqs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/ben2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/ben2.cfg
index fd376dac..fd376dac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/ben2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/ben2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/ben_011.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/ben_011.cfg
index 6ade29ad..6ade29ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/ben_011.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/ben_011.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/ben_042.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/ben_042.cfg
index c98cdf54..c98cdf54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/ben_042.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/ben_042.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/bool-pos-eol-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/bool-pos-eol-force.cfg
index 51044559..51044559 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/bool-pos-eol-force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/bool-pos-eol-force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/brace-allman.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/brace-allman.cfg
index 0e903302..0e903302 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/brace-allman.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/brace-allman.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_after_sparen.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/bug_637.cfg
index c9b9afbf..c9b9afbf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/c/sp_after_sparen.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/bug_637.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/bug_671.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/bug_671.cfg
index 00c0cf36..00c0cf36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/bug_671.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/bug_671.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/clark.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/clark.cfg
index e3325392..e3325392 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/clark.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/clark.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/clark.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/clark.rerun.cfg
index 3b33c7d6..3b33c7d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/clark.rerun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/clark.rerun.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/class-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/class-header.h
index 32e68a34..32e68a34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/class-header.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/class-header.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/cmt_insert-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/cmt_insert-0.cfg
index 86d05f95..86d05f95 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/cmt_insert-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/cmt_insert-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/cmt_insert-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/cmt_insert-1.cfg
index 91dbf03a..91dbf03a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/cmt_insert-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/cmt_insert-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/d.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/d.cfg
new file mode 100644
index 00000000..953964d3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/d.cfg
@@ -0,0 +1,51 @@
+sp_before_semi_for            = remove
+sp_arith                      = force
+sp_assign                     = force
+sp_compare                    = force
+sp_inside_paren               = remove
+sp_paren_paren                = remove
+sp_before_ptr_star            = force
+sp_between_ptr_star           = remove
+sp_after_ptr_star             = remove
+sp_after_ptr_star_func        = remove
+sp_before_sparen              = force
+sp_inside_rparen              = remove
+sp_inside_sparen              = remove
+sp_inside_for                 = remove
+sp_before_square              = remove
+sp_before_squares             = remove
+sp_after_comma                = force
+sp_after_cast                 = remove
+sp_func_proto_paren           = remove
+sp_func_def_paren             = remove
+sp_inside_fparen              = remove
+sp_func_call_paren            = remove
+sp_range                      = force
+sp_while_paren_open           = force
+indent_columns                = 4
+indent_with_tabs              = 0
+indent_class                  = true
+indent_case_brace             = 4
+indent_label                  = 2
+nl_var_def_blk_end_func_top   = 1
+nl_var_def_blk_end            = 1
+nl_enum_brace                 = add
+nl_if_brace                   = add
+nl_else_brace                 = add
+nl_else_if                    = remove
+nl_for_brace                  = add
+nl_before_case                = true
+nl_fdef_brace                 = add
+nl_after_brace_open           = true
+eat_blanks_after_open_brace   = true
+eat_blanks_before_close_brace = true
+nl_after_return               = true
+align_var_def_span            = 2
+align_var_def_star_style      = 1
+align_assign_span             = 1
+align_enum_equ_span           = 4
+align_var_class_span          = 2
+align_typedef_gap             = 3
+align_typedef_span            = 5
+align_typedef_star_style      = 1
+align_right_cmt_span          = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/del_semicolon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/del_semicolon.cfg
index 13434168..13434168 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/del_semicolon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/del_semicolon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/empty.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/file-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/file-header.h
index 63fb5185..63fb5185 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/file-header.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/file-header.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/file_footer.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/file_footer.txt
index 7ce80bad..7ce80bad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/file_footer.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/file_footer.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/file_header.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/file_header.txt
index 5431d0ff..5431d0ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/file_header.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/file_header.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/func-def-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/func-def-1.cfg
index 14879a94..14879a94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/func-def-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/func-def-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/func-def-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/func-def-2.cfg
index f9cf836c..f9cf836c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/func-def-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/func-def-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/func-def-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/func-def-3.cfg
index c868ae02..c868ae02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/func-def-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/func-def-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/func-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/func-header.h
index e6f83943..e6f83943 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/func-header.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/func-header.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/func-header2.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/func-header2.h
index 52bdf970..52bdf970 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/func-header2.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/func-header2.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/function_header.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/function_header.txt
index c6508a02..c6508a02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/function_header.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/function_header.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_columns-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/indent_columns-3.cfg
index d49cfc22..d49cfc22 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_columns-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/indent_columns-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_continue-8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/indent_continue-8.cfg
index 9bc69559..9bc69559 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_continue-8.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/indent_continue-8.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_inside_ternary_operator.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/indent_inside_ternary_operator.cfg
index ad5f98ed..ad5f98ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_inside_ternary_operator.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/indent_inside_ternary_operator.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_ternary_operator-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/indent_ternary_operator-1.cfg
index 80ea4e7a..80ea4e7a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_ternary_operator-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/indent_ternary_operator-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_ternary_operator-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/indent_ternary_operator-2.cfg
index 1d5a91ab..1d5a91ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_ternary_operator-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/indent_ternary_operator-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_var_def.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/indent_var_def.cfg
index 4345ee72..4345ee72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/indent_var_def.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/indent_var_def.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/issue_672.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/issue_672.cfg
index fb436753..fb436753 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/issue_672.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/issue_672.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/kw_subst.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/kw_subst.cfg
index 163d6f64..163d6f64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/kw_subst.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/kw_subst.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/kw_subst2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/kw_subst2.cfg
index 7f531264..7f531264 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/kw_subst2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/kw_subst2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/kw_subst3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/kw_subst3.cfg
index 1b4018f6..1b4018f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/kw_subst3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/kw_subst3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/kw_subst4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/kw_subst4.cfg
index a269bdf8..a269bdf8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/kw_subst4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/kw_subst4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/mod_case_brace_rm.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/mod_case_brace_rm.cfg
index 51252b69..51252b69 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/mod_case_brace_rm.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/mod_case_brace_rm.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/mod_full_brace_if_chain_only-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/mod_full_brace_if_chain_only-t.cfg
index ec61c84b..fef2fdfb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/mod_full_brace_if_chain_only-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/mod_full_brace_if_chain_only-t.cfg
@@ -1 +1,2 @@
+sp_sparen_brace                 = add
 mod_full_brace_if_chain_only    = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/mod_paren_on_return-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/mod_paren_on_return-a.cfg
index 6e5a38ec..6e5a38ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/mod_paren_on_return-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/mod_paren_on_return-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/mod_paren_on_return-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/mod_paren_on_return-r.cfg
index fb547f72..fb547f72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/mod_paren_on_return-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/mod_paren_on_return-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/msg-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/msg-header.h
index 79a0919f..79a0919f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/msg-header.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/msg-header.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/nl_before_after.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/nl_before_after.cfg
index b80dafa0..b80dafa0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/nl_before_after.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/nl_before_after.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/nl_before_ignore_after_case.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/nl_before_ignore_after_case.cfg
index 6d1bbb7d..6d1bbb7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/nl_before_ignore_after_case.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/nl_before_ignore_after_case.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/region-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/region-0.cfg
index a837d86f..a837d86f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/region-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/region-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/region-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/region-1.cfg
index 48ae77f3..48ae77f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/region-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/region-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/region-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/region-2.cfg
index 5beed445..5beed445 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/region-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/region-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/region-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/region-3.cfg
index 30a01c96..30a01c96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/region-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/region-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sort_imports.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sort_imports.cfg
index 655a684f..655a684f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sort_imports.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sort_imports.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_after_cast.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sp_after_cast.cfg
index c16cc978..c16cc978 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_after_cast.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sp_after_cast.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_after_type-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sp_after_type-f.cfg
index b7fa74f4..b7fa74f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_after_type-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sp_after_type-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_after_type-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sp_after_type-r.cfg
index 78a64119..78a64119 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_after_type-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sp_after_type-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_arith-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sp_arith-f.cfg
index 6cd2b6b0..6cd2b6b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_arith-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sp_arith-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_before_byref-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sp_before_byref-r.cfg
index 2f5d1eff..2f5d1eff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_before_byref-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sp_before_byref-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_cmt_cpp_start-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sp_cmt_cpp_start-a.cfg
index d7e6adf1..d7e6adf1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_cmt_cpp_start-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sp_cmt_cpp_start-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_cmt_cpp_start_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sp_cmt_cpp_start_force.cfg
index e87c9b0d..e87c9b0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_cmt_cpp_start_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sp_cmt_cpp_start_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_cparen_oparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sp_cparen_oparen-f.cfg
index c2af4d15..c2af4d15 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/sp_cparen_oparen-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sp_cparen_oparen-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sp_inside_fparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sp_inside_fparen-f.cfg
new file mode 100644
index 00000000..ef2f86d6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/sp_inside_fparen-f.cfg
@@ -0,0 +1,2 @@
+sp_inside_fparen = force
+sp_inside_rparen = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/space_indent_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/space_indent_columns-4.cfg
index f05c685f..f05c685f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/space_indent_columns-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/space_indent_columns-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/star_pos-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/star_pos-0.cfg
index 3648d94a..3648d94a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/star_pos-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/star_pos-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/tde.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/tde.cfg
new file mode 100644
index 00000000..c7626042
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/tde.cfg
@@ -0,0 +1,849 @@
+newlines                        = lf       # lf/crlf/cr/auto
+input_tab_size                  = 2        # unsigned number
+output_tab_size                 = 2        # unsigned number
+string_escape_char              = 92       # unsigned number
+string_escape_char2             = 0        # unsigned number
+string_replace_tab_chars        = false    # true/false
+tok_split_gte                   = false    # true/false
+disable_processing_nl_cont      = false    # true/false
+disable_processing_cmt          = " *INDENT-OFF*"      # string
+enable_processing_cmt           = " *INDENT-ON*"     # string
+enable_digraphs                 = true     # true/false
+processing_cmt_as_regex         = false    # true/false
+utf8_bom                        = ignore   # ignore/add/remove/force/not_defined
+utf8_byte                       = false    # true/false
+utf8_force                      = false    # true/false
+sp_arith                        = force   # ignore/add/remove/force/not_defined
+sp_arith_additive               = force    # ignore/add/remove/force/not_defined
+sp_assign                       = force    # ignore/add/remove/force/not_defined
+sp_cpp_lambda_assign            = force    # ignore/add/remove/force/not_defined
+sp_cpp_lambda_square_paren      = remove   # ignore/add/remove/force/not_defined
+sp_cpp_lambda_square_brace      = remove   # ignore/add/remove/force/not_defined
+sp_cpp_lambda_argument_list     = ignore   # ignore/add/remove/force/not_defined
+sp_cpp_lambda_paren_brace       = force    # ignore/add/remove/force/not_defined
+sp_cpp_lambda_fparen            = force    # ignore/add/remove/force/not_defined
+sp_assign_default               = force    # ignore/add/remove/force/not_defined
+sp_before_assign                = force    # ignore/add/remove/force/not_defined
+sp_after_assign                 = force    # ignore/add/remove/force/not_defined
+sp_enum_brace                   = force    # ignore/add/remove/force/not_defined
+sp_enum_paren                   = force    # ignore/add/remove/force/not_defined
+sp_enum_assign                  = force    # ignore/add/remove/force/not_defined
+sp_enum_before_assign           = force    # ignore/add/remove/force/not_defined
+sp_enum_after_assign            = force    # ignore/add/remove/force/not_defined
+sp_enum_colon                   = force   # ignore/add/remove/force/not_defined
+sp_pp_concat                    = remove   # ignore/add/remove/force/not_defined
+sp_pp_stringify                 = remove   # ignore/add/remove/force/not_defined
+sp_before_pp_stringify          = remove   # ignore/add/remove/force/not_defined
+sp_bool                         = force    # ignore/add/remove/force/not_defined
+sp_compare                      = force    # ignore/add/remove/force/not_defined
+sp_inside_paren                 = remove   # ignore/add/remove/force/not_defined
+sp_paren_paren                  = remove   # ignore/add/remove/force/not_defined
+sp_cparen_oparen                = remove   # ignore/add/remove/force/not_defined
+sp_balance_nested_parens        = false    # true/false
+sp_paren_brace                  = force    # ignore/add/remove/force/not_defined
+sp_brace_brace                  = remove   # ignore/add/remove/force/not_defined
+sp_before_ptr_star              = force    # ignore/add/remove/force/not_defined
+sp_before_unnamed_ptr_star      = remove    # ignore/add/remove/force/not_defined
+sp_before_qualifier_ptr_star    = ignore   # ignore/add/remove/force/not_defined
+sp_before_operator_ptr_star     = ignore   # ignore/add/remove/force/not_defined
+sp_before_scope_ptr_star        = ignore   # ignore/add/remove/force/not_defined
+sp_before_global_scope_ptr_star = ignore   # ignore/add/remove/force/not_defined
+sp_qualifier_unnamed_ptr_star   = ignore   # ignore/add/remove/force/not_defined
+sp_between_ptr_star             = remove   # ignore/add/remove/force/not_defined
+sp_between_ptr_ref              = remove   # ignore/add/remove/force/not_defined
+sp_after_ptr_star               = remove   # ignore/add/remove/force/not_defined
+sp_after_ptr_block_caret        = remove   # ignore/add/remove/force/not_defined
+sp_after_ptr_star_qualifier     = remove   # ignore/add/remove/force/not_defined
+sp_after_ptr_star_func          = force    # ignore/add/remove/force/not_defined
+sp_after_ptr_star_trailing      = force   # ignore/add/remove/force/not_defined
+sp_ptr_star_func_var            = remove   # ignore/add/remove/force/not_defined
+sp_ptr_star_func_type           = remove   # ignore/add/remove/force/not_defined
+sp_ptr_star_paren               = force    # ignore/add/remove/force/not_defined
+sp_before_ptr_star_func         = remove   # ignore/add/remove/force/not_defined
+sp_qualifier_ptr_star_func      = remove   # ignore/add/remove/force/not_defined
+sp_before_ptr_star_trailing     = remove   # ignore/add/remove/force/not_defined
+sp_qualifier_ptr_star_trailing  = remove   # ignore/add/remove/force/not_defined
+sp_before_byref                 = force    # ignore/add/remove/force/not_defined
+sp_before_unnamed_byref         = force    # ignore/add/remove/force/not_defined
+sp_after_byref                  = remove   # ignore/add/remove/force/not_defined
+sp_after_byref_func             = force    # ignore/add/remove/force/not_defined
+sp_before_byref_func            = remove   # ignore/add/remove/force/not_defined
+sp_byref_paren                  = ignore   # ignore/add/remove/force/not_defined
+sp_after_type                   = force    # ignore/add/remove/force/not_defined
+sp_after_decltype               = remove   # ignore/add/remove/force/not_defined
+sp_before_template_paren        = remove   # ignore/add/remove/force/not_defined
+sp_template_angle               = remove   # ignore/add/remove/force/not_defined
+sp_before_angle                 = remove   # ignore/add/remove/force/not_defined
+sp_inside_angle                 = remove   # ignore/add/remove/force/not_defined
+sp_inside_angle_empty           = remove   # ignore/add/remove/force/not_defined
+sp_angle_colon                  = force    # ignore/add/remove/force/not_defined
+sp_after_angle                  = force    # ignore/add/remove/force/not_defined
+sp_angle_paren                  = remove   # ignore/add/remove/force/not_defined
+sp_angle_paren_empty            = remove   # ignore/add/remove/force/not_defined
+sp_angle_word                   = force    # ignore/add/remove/force/not_defined
+sp_angle_shift                  = remove   # ignore/add/remove/force/not_defined
+sp_permit_cpp11_shift           = true     # true/false
+sp_before_sparen                = force    # ignore/add/remove/force/not_defined
+sp_inside_sparen                = remove   # ignore/add/remove/force/not_defined
+sp_inside_sparen_open           = remove   # ignore/add/remove/force/not_defined
+sp_inside_sparen_close          = remove   # ignore/add/remove/force/not_defined
+sp_inside_for                   = remove   # ignore/add/remove/force/not_defined
+sp_inside_for_open              = remove   # ignore/add/remove/force/not_defined
+sp_inside_for_close             = remove   # ignore/add/remove/force/not_defined
+sp_sparen_paren                 = remove   # ignore/add/remove/force/not_defined
+sp_after_sparen                 = force    # ignore/add/remove/force/not_defined
+sp_sparen_brace                 = force    # ignore/add/remove/force/not_defined
+sp_do_brace_open                = force    # ignore/add/remove/force/not_defined
+sp_brace_close_while            = force    # ignore/add/remove/force/not_defined
+sp_while_paren_open             = force    # ignore/add/remove/force/not_defined
+sp_invariant_paren              = force    # ignore/add/remove/force/not_defined
+sp_after_invariant_paren        = remove   # ignore/add/remove/force/not_defined
+sp_special_semi                 = remove   # ignore/add/remove/force/not_defined
+sp_before_semi                  = remove   # ignore/add/remove/force/not_defined
+sp_before_semi_for              = remove   # ignore/add/remove/force/not_defined
+sp_before_semi_for_empty        = remove   # ignore/add/remove/force/not_defined
+sp_between_semi_for_empty       = remove   # ignore/add/remove/force/not_defined
+sp_after_semi                   = force    # ignore/add/remove/force/not_defined
+sp_after_semi_for               = force    # ignore/add/remove/force/not_defined
+sp_after_semi_for_empty         = force    # ignore/add/remove/force/not_defined
+sp_before_square                = remove   # ignore/add/remove/force/not_defined
+sp_before_vardef_square         = remove   # ignore/add/remove/force/not_defined
+sp_before_square_asm_block      = remove   # ignore/add/remove/force/not_defined
+sp_before_squares               = remove   # ignore/add/remove/force/not_defined
+sp_cpp_before_struct_binding    = remove   # ignore/add/remove/force/not_defined
+sp_inside_square                = remove   # ignore/add/remove/force/not_defined
+sp_inside_square_empty          = remove   # ignore/add/remove/force/not_defined
+sp_inside_square_oc_array       = remove   # ignore/add/remove/force/not_defined
+sp_after_comma                  = force    # ignore/add/remove/force/not_defined
+sp_before_comma                 = remove   # ignore/add/remove/force/not_defined
+sp_after_mdatype_commas         = force    # ignore/add/remove/force/not_defined
+sp_before_mdatype_commas        = force    # ignore/add/remove/force/not_defined
+sp_between_mdatype_commas       = force    # ignore/add/remove/force/not_defined
+sp_paren_comma                  = force    # ignore/add/remove/force/not_defined
+sp_type_colon                   = force    # ignore/add/remove/force/not_defined
+sp_after_ellipsis               = remove   # ignore/add/remove/force/not_defined
+sp_before_ellipsis              = force    # ignore/add/remove/force/not_defined
+sp_type_ellipsis                = force    # ignore/add/remove/force/not_defined
+sp_ptr_type_ellipsis            = remove   # ignore/add/remove/force/not_defined
+sp_paren_ellipsis               = remove   # ignore/add/remove/force/not_defined
+sp_byref_ellipsis               = remove   # ignore/add/remove/force/not_defined
+sp_paren_qualifier              = force    # ignore/add/remove/force/not_defined
+sp_paren_noexcept               = force    # ignore/add/remove/force/not_defined
+sp_after_class_colon            = force    # ignore/add/remove/force/not_defined
+sp_before_class_colon           = force    # ignore/add/remove/force/not_defined
+sp_after_constr_colon           = force    # ignore/add/remove/force/not_defined
+sp_before_constr_colon          = force    # ignore/add/remove/force/not_defined
+sp_before_case_colon            = remove   # ignore/add/remove/force/not_defined
+sp_after_operator               = remove   # ignore/add/remove/force/not_defined
+sp_after_operator_sym           = remove   # ignore/add/remove/force/not_defined
+sp_after_operator_sym_empty     = remove   # ignore/add/remove/force/not_defined
+sp_after_cast                   = remove   # ignore/add/remove/force/not_defined
+sp_inside_paren_cast            = remove   # ignore/add/remove/force/not_defined
+sp_cpp_cast_paren               = remove   # ignore/add/remove/force/not_defined
+sp_sizeof_paren                 = remove   # ignore/add/remove/force/not_defined
+sp_sizeof_ellipsis              = remove   # ignore/add/remove/force/not_defined
+sp_sizeof_ellipsis_paren        = remove   # ignore/add/remove/force/not_defined
+sp_ellipsis_parameter_pack      = remove   # ignore/add/remove/force/not_defined
+sp_parameter_pack_ellipsis      = remove   # ignore/add/remove/force/not_defined
+sp_decltype_paren               = remove   # ignore/add/remove/force/not_defined
+sp_after_tag                    = remove   # ignore/add/remove/force/not_defined
+sp_inside_braces_enum           = force    # ignore/add/remove/force/not_defined
+sp_inside_braces_struct         = remove   # ignore/add/remove/force/not_defined
+sp_inside_braces_oc_dict        = remove   # ignore/add/remove/force/not_defined
+sp_after_type_brace_init_lst_open = force    # ignore/add/remove/force/not_defined
+sp_before_type_brace_init_lst_close = force    # ignore/add/remove/force/not_defined
+sp_inside_type_brace_init_lst   = remove   # ignore/add/remove/force/not_defined
+sp_inside_braces                = add      # ignore/add/remove/force/not_defined
+sp_inside_braces_empty          = remove   # ignore/add/remove/force/not_defined
+sp_trailing_return              = remove   # ignore/add/remove/force/not_defined
+sp_type_func                    = force    # ignore/add/remove/force/not_defined
+sp_type_brace_init_lst          = force    # ignore/add/remove/force/not_defined
+sp_func_proto_paren             = remove   # ignore/add/remove/force/not_defined
+sp_func_proto_paren_empty       = remove   # ignore/add/remove/force/not_defined
+sp_func_type_paren              = remove   # ignore/add/remove/force/not_defined
+sp_func_def_paren               = remove   # ignore/add/remove/force/not_defined
+sp_func_def_paren_empty         = remove   # ignore/add/remove/force/not_defined
+sp_inside_fparens               = remove   # ignore/add/remove/force/not_defined
+sp_inside_fparen                = remove   # ignore/add/remove/force/not_defined
+sp_func_call_user_inside_rparen = remove   # ignore/add/remove/force/not_defined
+sp_inside_rparens               = remove   # ignore/add/remove/force/not_defined
+sp_inside_rparen                = remove   # ignore/add/remove/force/not_defined
+sp_inside_tparen                = remove   # ignore/add/remove/force/not_defined
+sp_after_tparen_close           = remove   # ignore/add/remove/force/not_defined
+sp_square_fparen                = remove   # ignore/add/remove/force/not_defined
+sp_fparen_brace                 = force    # ignore/add/remove/force/not_defined
+sp_fparen_brace_initializer     = force    # ignore/add/remove/force/not_defined
+sp_fparen_dbrace                = force    # ignore/add/remove/force/not_defined
+sp_func_call_paren              = remove   # ignore/add/remove/force/not_defined
+sp_func_call_paren_empty        = remove   # ignore/add/remove/force/not_defined
+sp_func_call_user_paren         = remove   # ignore/add/remove/force/not_defined
+sp_func_call_user_inside_fparen = remove   # ignore/add/remove/force/not_defined
+sp_func_call_user_paren_paren   = remove   # ignore/add/remove/force/not_defined
+sp_func_class_paren             = remove   # ignore/add/remove/force/not_defined
+sp_func_class_paren_empty       = remove   # ignore/add/remove/force/not_defined
+sp_return                       = force    # ignore/add/remove/force/not_defined
+sp_return_paren                 = force    # ignore/add/remove/force/not_defined
+sp_return_brace                 = force    # ignore/add/remove/force/not_defined
+sp_attribute_paren              = remove   # ignore/add/remove/force/not_defined
+sp_defined_paren                = force    # ignore/add/remove/force/not_defined
+sp_throw_paren                  = force    # ignore/add/remove/force/not_defined
+sp_after_throw                  = force    # ignore/add/remove/force/not_defined
+sp_catch_paren                  = force    # ignore/add/remove/force/not_defined
+sp_oc_catch_paren               = force    # ignore/add/remove/force/not_defined
+sp_before_oc_proto_list         = force    # ignore/add/remove/force/not_defined
+sp_oc_classname_paren           = remove   # ignore/add/remove/force/not_defined
+sp_version_paren                = ignore   # ignore/add/remove/force/not_defined
+sp_scope_paren                  = ignore   # ignore/add/remove/force/not_defined
+sp_super_paren                  = remove   # ignore/add/remove/force/not_defined
+sp_this_paren                   = remove   # ignore/add/remove/force/not_defined
+sp_macro                        = force    # ignore/add/remove/force/not_defined
+sp_macro_func                   = force    # ignore/add/remove/force/not_defined
+sp_else_brace                   = force    # ignore/add/remove/force/not_defined
+sp_brace_else                   = force    # ignore/add/remove/force/not_defined
+sp_brace_typedef                = force    # ignore/add/remove/force/not_defined
+sp_catch_brace                  = force    # ignore/add/remove/force/not_defined
+sp_oc_catch_brace               = force    # ignore/add/remove/force/not_defined
+sp_brace_catch                  = force    # ignore/add/remove/force/not_defined
+sp_oc_brace_catch               = force    # ignore/add/remove/force/not_defined
+sp_finally_brace                = force    # ignore/add/remove/force/not_defined
+sp_brace_finally                = force    # ignore/add/remove/force/not_defined
+sp_try_brace                    = force    # ignore/add/remove/force/not_defined
+sp_getset_brace                 = force    # ignore/add/remove/force/not_defined
+sp_word_brace_init_lst          = remove   # ignore/add/remove/force/not_defined
+sp_word_brace_ns                = force    # ignore/add/remove/force/not_defined
+sp_before_dc                    = remove   # ignore/add/remove/force/not_defined
+sp_after_dc                     = remove   # ignore/add/remove/force/not_defined
+sp_d_array_colon                = force    # ignore/add/remove/force/not_defined
+sp_not                          = remove   # ignore/add/remove/force/not_defined
+sp_not_not                      = remove   # ignore/add/remove/force/not_defined
+sp_inv                          = remove   # ignore/add/remove/force/not_defined
+sp_addr                         = remove   # ignore/add/remove/force/not_defined
+sp_member                       = remove   # ignore/add/remove/force/not_defined
+sp_deref                        = remove   # ignore/add/remove/force/not_defined
+sp_sign                         = remove   # ignore/add/remove/force/not_defined
+sp_incdec                       = remove   # ignore/add/remove/force/not_defined
+sp_before_nl_cont               = force    # ignore/add/remove/force/not_defined
+sp_after_oc_scope               = ignore   # ignore/add/remove/force/not_defined
+sp_after_oc_colon               = ignore   # ignore/add/remove/force/not_defined
+sp_before_oc_colon              = ignore   # ignore/add/remove/force/not_defined
+sp_after_oc_dict_colon          = ignore   # ignore/add/remove/force/not_defined
+sp_before_oc_dict_colon         = ignore   # ignore/add/remove/force/not_defined
+sp_after_send_oc_colon          = ignore   # ignore/add/remove/force/not_defined
+sp_before_send_oc_colon         = ignore   # ignore/add/remove/force/not_defined
+sp_after_oc_type                = ignore   # ignore/add/remove/force/not_defined
+sp_after_oc_return_type         = ignore   # ignore/add/remove/force/not_defined
+sp_after_oc_at_sel              = ignore   # ignore/add/remove/force/not_defined
+sp_after_oc_at_sel_parens       = ignore   # ignore/add/remove/force/not_defined
+sp_inside_oc_at_sel_parens      = ignore   # ignore/add/remove/force/not_defined
+sp_before_oc_block_caret        = ignore   # ignore/add/remove/force/not_defined
+sp_after_oc_block_caret         = ignore   # ignore/add/remove/force/not_defined
+sp_after_oc_msg_receiver        = ignore   # ignore/add/remove/force/not_defined
+sp_after_oc_property            = ignore   # ignore/add/remove/force/not_defined
+sp_after_oc_synchronized        = ignore   # ignore/add/remove/force/not_defined
+sp_cond_colon                   = force    # ignore/add/remove/force/not_defined
+sp_cond_colon_before            = force    # ignore/add/remove/force/not_defined
+sp_cond_colon_after             = force    # ignore/add/remove/force/not_defined
+sp_cond_question                = force    # ignore/add/remove/force/not_defined
+sp_cond_question_before         = force    # ignore/add/remove/force/not_defined
+sp_cond_question_after          = force    # ignore/add/remove/force/not_defined
+sp_cond_ternary_short           = force    # ignore/add/remove/force/not_defined
+sp_case_label                   = force    # ignore/add/remove/force/not_defined
+sp_range                        = ignore   # ignore/add/remove/force/not_defined
+sp_after_for_colon              = force    # ignore/add/remove/force/not_defined
+sp_before_for_colon             = force    # ignore/add/remove/force/not_defined
+sp_extern_paren                 = ignore   # ignore/add/remove/force/not_defined
+sp_cmt_cpp_start                = ignore   # ignore/add/remove/force/not_defined
+sp_cmt_cpp_pvs                  = false    # true/false
+sp_cmt_cpp_lint                 = false    # true/false
+sp_cmt_cpp_region               = ignore   # ignore/add/remove/force/not_defined
+sp_cmt_cpp_doxygen              = false    # true/false
+sp_cmt_cpp_qttr                 = false    # true/false
+sp_endif_cmt                    = force    # ignore/add/remove/force/not_defined
+sp_after_new                    = force    # ignore/add/remove/force/not_defined
+sp_between_new_paren            = remove   # ignore/add/remove/force/not_defined
+sp_after_newop_paren            = force    # ignore/add/remove/force/not_defined
+sp_inside_newop_paren           = remove   # ignore/add/remove/force/not_defined
+sp_inside_newop_paren_open      = remove   # ignore/add/remove/force/not_defined
+sp_inside_newop_paren_close     = remove   # ignore/add/remove/force/not_defined
+sp_before_tr_cmt                = force    # ignore/add/remove/force/not_defined
+sp_num_before_tr_cmt            = 0        # unsigned number
+sp_before_emb_cmt               = force    # ignore/add/remove/force/not_defined
+sp_num_before_emb_cmt           = 0        # unsigned number
+sp_after_emb_cmt                = ignore   # ignore/add/remove/force/not_defined
+sp_num_after_emb_cmt            = 0        # unsigned number
+sp_annotation_paren             = force    # ignore/add/remove/force/not_defined
+sp_skip_vbrace_tokens           = false    # true/false
+sp_after_noexcept               = remove   # ignore/add/remove/force/not_defined
+sp_vala_after_translation       = remove   # ignore/add/remove/force/not_defined
+sp_before_bit_colon             = force    # ignore/add/remove/force/not_defined
+sp_after_bit_colon              = force    # ignore/add/remove/force/not_defined
+force_tab_after_define          = false    # true/false
+indent_columns                  = 2        # unsigned number
+indent_ignore_first_continue    = false    # true/false
+indent_continue                 = -8       # number
+indent_continue_class_head      = 0        # unsigned number
+indent_single_newlines          = false    # true/false
+indent_param                    = 0        # unsigned number
+indent_with_tabs                = 1        # unsigned number
+indent_cmt_with_tabs            = false    # true/false
+indent_align_string             = true     # true/false
+indent_xml_string               = 0        # unsigned number
+indent_brace                    = 0        # unsigned number
+indent_braces                   = false    # true/false
+indent_braces_no_func           = false    # true/false
+indent_braces_no_class          = false    # true/false
+indent_braces_no_struct         = false    # true/false
+indent_brace_parent             = false    # true/false
+indent_paren_open_brace         = false    # true/false
+indent_cs_delegate_brace        = false    # true/false
+indent_cs_delegate_body         = false    # true/false
+indent_namespace                = true     # true/false
+indent_namespace_single_indent  = false    # true/false
+indent_namespace_level          = 0        # unsigned number
+indent_namespace_limit          = 0        # unsigned number
+indent_namespace_inner_only     = false    # true/false
+indent_extern                   = true     # true/false
+indent_class                    = true     # true/false
+indent_ignore_before_class_colon = false   # true/false
+indent_before_class_colon       = 0        # number
+indent_class_colon              = true     # true/false
+indent_class_on_colon           = false    # true/false
+indent_ignore_before_constr_colon = false  # true/false
+indent_constr_colon             = true     # true/false
+indent_ctor_init_leading        = 2        # unsigned number
+indent_ctor_init_following      = 2        # unsigned number
+indent_ctor_init                = 2        # number
+indent_else_if                  = false    # true/false
+indent_var_def_blk              = 0        # number
+indent_var_def_cont             = false    # true/false
+indent_shift                    = 0        # number
+indent_func_def_force_col1      = false    # true/false
+indent_func_call_param          = false    # true/false
+indent_func_def_param           = false    # true/false
+indent_func_def_param_paren_pos_threshold = 0        # unsigned number
+indent_func_proto_param         = false    # true/false
+indent_func_class_param         = false    # true/false
+indent_func_ctor_var_param      = false    # true/false
+indent_template_param           = false    # true/false
+indent_func_param_double        = false    # true/false
+indent_func_const               = 0        # unsigned number
+indent_func_throw               = 0        # unsigned number
+indent_macro_brace              = true     # true/false
+indent_member                   = 0        # unsigned number
+indent_member_single            = false    # true/false
+indent_single_line_comments_before = 0     # unsigned number
+indent_single_line_comments_after  = 0     # unsigned number
+indent_sparen_extra             = 0        # number
+indent_relative_single_line_comments = false    # true/false
+indent_switch_case              = 2        # unsigned number
+indent_switch_body              = 0        # unsigned number
+indent_ignore_case_brace        = false    # true/false
+indent_case_brace               = 0        # number
+indent_switch_break_with_case   = false    # true/false
+indent_switch_pp                = true     # true/false
+indent_case_shift               = 0        # unsigned number
+indent_case_comment             = true     # true/false
+indent_comment                  = true     # true/false
+indent_col1_comment             = true     # true/false
+indent_col1_multi_string_literal = true    # true/false
+indent_comment_align_thresh     = 3        # unsigned number
+indent_ignore_label             = false    # true/false
+indent_label                    = 1        # number
+indent_access_spec              = 0        # number
+indent_access_spec_body         = true     # true/false
+indent_paren_nl                 = false    # true/false
+indent_paren_close              = 0        # number
+indent_paren_after_func_def     = false    # true/false
+indent_paren_after_func_decl    = false    # true/false
+indent_paren_after_func_call    = false    # true/false
+indent_comma_brace              = 0        # number
+indent_comma_paren              = 0        # number
+indent_bool_paren               = 0        # number
+indent_ignore_bool              = false    # true/false
+indent_ignore_arith             = false    # true/false
+indent_semicolon_for_paren      = false    # true/false
+indent_ignore_semicolon         = false    # true/false
+indent_first_bool_expr          = false    # true/false
+indent_first_for_expr           = false    # true/false
+indent_square_nl                = false    # true/false
+indent_preserve_sql             = false    # true/false
+indent_ignore_assign            = false    # true/false
+indent_align_assign             = true     # true/false
+indent_off_after_assign         = false    # true/false
+indent_align_paren              = true     # true/false
+indent_oc_inside_msg_sel        = false    # true/false
+indent_oc_block                 = false    # true/false
+indent_oc_block_msg             = 0        # unsigned number
+indent_oc_msg_colon             = 0        # unsigned number
+indent_oc_msg_prioritize_first_colon = true     # true/false
+indent_oc_block_msg_xcode_style = false    # true/false
+indent_oc_block_msg_from_keyword = false    # true/false
+indent_oc_block_msg_from_colon  = false    # true/false
+indent_oc_block_msg_from_caret  = false    # true/false
+indent_oc_block_msg_from_brace  = false    # true/false
+indent_min_vbrace_open          = 0        # unsigned number
+indent_vbrace_open_on_tabstop   = false    # true/false
+indent_token_after_brace        = true     # true/false
+indent_cpp_lambda_body          = true     # true/false
+indent_compound_literal_return  = false    # true/false
+indent_using_block              = true     # true/false
+indent_ternary_operator         = 2        # unsigned number
+indent_inside_ternary_operator  = false    # true/false
+indent_off_after_return         = false    # true/false
+indent_off_after_return_new     = false    # true/false
+indent_single_after_return      = false    # true/false
+indent_ignore_asm_block         = false    # true/false
+donot_indent_func_def_close_paren = true   # true/false
+nl_collapse_empty_body          = false    # true/false
+nl_assign_leave_one_liners      = true     # true/false
+nl_class_leave_one_liners       = false    # true/false
+nl_enum_leave_one_liners        = false    # true/false
+nl_getset_leave_one_liners      = false    # true/false
+nl_cs_property_leave_one_liners = false    # true/false
+nl_func_leave_one_liners        = false    # true/false
+nl_cpp_lambda_leave_one_liners  = false    # true/false
+nl_if_leave_one_liners          = false    # true/false
+nl_while_leave_one_liners       = false    # true/false
+nl_do_leave_one_liners          = false    # true/false
+nl_for_leave_one_liners         = false    # true/false
+nl_oc_msg_leave_one_liner       = false    # true/false
+nl_oc_mdef_brace                = ignore   # ignore/add/remove/force/not_defined
+nl_oc_block_brace               = ignore   # ignore/add/remove/force/not_defined
+nl_oc_before_interface          = ignore   # ignore/add/remove/force/not_defined
+nl_oc_before_implementation     = ignore   # ignore/add/remove/force/not_defined
+nl_oc_before_end                = ignore   # ignore/add/remove/force/not_defined
+nl_oc_interface_brace           = ignore   # ignore/add/remove/force/not_defined
+nl_oc_implementation_brace      = ignore   # ignore/add/remove/force/not_defined
+nl_start_of_file                = remove   # ignore/add/remove/force/not_defined
+nl_start_of_file_min            = 0        # unsigned number
+nl_end_of_file                  = force    # ignore/add/remove/force/not_defined
+nl_end_of_file_min              = 1        # unsigned number
+nl_assign_brace                 = ignore   # ignore/add/remove/force/not_defined
+nl_assign_square                = ignore   # ignore/add/remove/force/not_defined
+nl_tsquare_brace                = remove   # ignore/add/remove/force/not_defined
+nl_after_square_assign          = ignore   # ignore/add/remove/force/not_defined
+nl_fcall_brace                  = force    # ignore/add/remove/force/not_defined
+nl_enum_brace                   = force    # ignore/add/remove/force/not_defined
+nl_enum_class                   = force    # ignore/add/remove/force/not_defined
+nl_enum_class_identifier        = force    # ignore/add/remove/force/not_defined
+nl_enum_identifier_colon        = force    # ignore/add/remove/force/not_defined
+nl_enum_colon_type              = force    # ignore/add/remove/force/not_defined
+nl_struct_brace                 = force    # ignore/add/remove/force/not_defined
+nl_union_brace                  = force    # ignore/add/remove/force/not_defined
+nl_if_brace                     = force    # ignore/add/remove/force/not_defined
+nl_brace_else                   = force    # ignore/add/remove/force/not_defined
+nl_elseif_brace                 = force    # ignore/add/remove/force/not_defined
+nl_else_brace                   = force    # ignore/add/remove/force/not_defined
+nl_else_if                      = remove   # ignore/add/remove/force/not_defined
+nl_before_opening_brace_func_class_def = force    # ignore/add/remove/force/not_defined
+nl_before_if_closing_paren      = remove   # ignore/add/remove/force/not_defined
+nl_brace_finally                = force    # ignore/add/remove/force/not_defined
+nl_finally_brace                = force    # ignore/add/remove/force/not_defined
+nl_try_brace                    = force    # ignore/add/remove/force/not_defined
+nl_getset_brace                 = force    # ignore/add/remove/force/not_defined
+nl_for_brace                    = force    # ignore/add/remove/force/not_defined
+nl_catch_brace                  = force    # ignore/add/remove/force/not_defined
+nl_oc_catch_brace               = force    # ignore/add/remove/force/not_defined
+nl_brace_catch                  = force    # ignore/add/remove/force/not_defined
+nl_oc_brace_catch               = force    # ignore/add/remove/force/not_defined
+nl_brace_square                 = remove   # ignore/add/remove/force/not_defined
+nl_brace_fparen                 = remove   # ignore/add/remove/force/not_defined
+nl_while_brace                  = force    # ignore/add/remove/force/not_defined
+nl_scope_brace                  = ignore   # ignore/add/remove/force/not_defined
+nl_unittest_brace               = ignore   # ignore/add/remove/force/not_defined
+nl_version_brace                = ignore   # ignore/add/remove/force/not_defined
+nl_using_brace                  = force    # ignore/add/remove/force/not_defined
+nl_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
+nl_do_brace                     = force    # ignore/add/remove/force/not_defined
+nl_brace_while                  = force    # ignore/add/remove/force/not_defined
+nl_switch_brace                 = force    # ignore/add/remove/force/not_defined
+nl_synchronized_brace           = force    # ignore/add/remove/force/not_defined
+nl_multi_line_cond              = true     # true/false
+nl_multi_line_sparen_open       = remove   # ignore/add/remove/force/not_defined
+nl_multi_line_sparen_close      = remove   # ignore/add/remove/force/not_defined
+nl_multi_line_define            = true     # true/false
+nl_before_case                  = true     # true/false
+nl_after_case                   = true     # true/false
+nl_case_colon_brace             = force    # ignore/add/remove/force/not_defined
+nl_before_throw                 = remove   # ignore/add/remove/force/not_defined
+nl_namespace_brace              = force    # ignore/add/remove/force/not_defined
+nl_template_class               = force    # ignore/add/remove/force/not_defined
+nl_template_class_decl          = force    # ignore/add/remove/force/not_defined
+nl_template_class_decl_special  = force    # ignore/add/remove/force/not_defined
+nl_template_class_def           = force    # ignore/add/remove/force/not_defined
+nl_template_class_def_special   = force    # ignore/add/remove/force/not_defined
+nl_template_func                = force    # ignore/add/remove/force/not_defined
+nl_template_func_decl           = force    # ignore/add/remove/force/not_defined
+nl_template_func_decl_special   = force    # ignore/add/remove/force/not_defined
+nl_template_func_def            = force    # ignore/add/remove/force/not_defined
+nl_template_func_def_special    = remove   # ignore/add/remove/force/not_defined
+nl_template_var                 = remove   # ignore/add/remove/force/not_defined
+nl_template_using               = remove   # ignore/add/remove/force/not_defined
+nl_class_brace                  = force    # ignore/add/remove/force/not_defined
+nl_class_init_args              = remove   # ignore/add/remove/force/not_defined
+nl_constr_init_args             = remove   # ignore/add/remove/force/not_defined
+nl_enum_own_lines               = force    # ignore/add/remove/force/not_defined
+nl_func_type_name               = remove   # ignore/add/remove/force/not_defined
+nl_func_type_name_class         = remove   # ignore/add/remove/force/not_defined
+nl_func_class_scope             = remove   # ignore/add/remove/force/not_defined
+nl_func_scope_name              = remove   # ignore/add/remove/force/not_defined
+nl_func_proto_type_name         = remove   # ignore/add/remove/force/not_defined
+nl_func_paren                   = remove   # ignore/add/remove/force/not_defined
+nl_func_paren_empty             = remove   # ignore/add/remove/force/not_defined
+nl_func_def_paren               = remove   # ignore/add/remove/force/not_defined
+nl_func_def_paren_empty         = remove   # ignore/add/remove/force/not_defined
+nl_func_call_paren              = remove   # ignore/add/remove/force/not_defined
+nl_func_call_paren_empty        = remove   # ignore/add/remove/force/not_defined
+nl_func_decl_start              = remove   # ignore/add/remove/force/not_defined
+nl_func_def_start               = remove   # ignore/add/remove/force/not_defined
+nl_func_decl_start_single       = remove   # ignore/add/remove/force/not_defined
+nl_func_def_start_single        = remove   # ignore/add/remove/force/not_defined
+nl_func_decl_start_multi_line   = false    # true/false
+nl_func_def_start_multi_line    = false    # true/false
+nl_func_decl_args               = remove   # ignore/add/remove/force/not_defined
+nl_func_def_args                = remove   # ignore/add/remove/force/not_defined
+nl_func_call_args               = remove   # ignore/add/remove/force/not_defined
+nl_func_decl_args_multi_line    = false    # true/false
+nl_func_def_args_multi_line     = false    # true/false
+nl_func_decl_end                = remove   # ignore/add/remove/force/not_defined
+nl_func_def_end                 = remove   # ignore/add/remove/force/not_defined
+nl_func_decl_end_single         = remove   # ignore/add/remove/force/not_defined
+nl_func_def_end_single          = remove   # ignore/add/remove/force/not_defined
+nl_func_decl_end_multi_line     = false    # true/false
+nl_func_def_end_multi_line      = false    # true/false
+nl_func_decl_empty              = remove   # ignore/add/remove/force/not_defined
+nl_func_def_empty               = remove   # ignore/add/remove/force/not_defined
+nl_func_call_empty              = remove   # ignore/add/remove/force/not_defined
+nl_func_call_start              = remove   # ignore/add/remove/force/not_defined
+nl_func_call_end                = remove   # ignore/add/remove/force/not_defined
+nl_func_call_start_multi_line   = false    # true/false
+nl_func_call_args_multi_line    = false    # true/false
+nl_func_call_end_multi_line     = false    # true/false
+nl_func_call_args_multi_line_ignore_closures = true     # true/false
+nl_template_start               = false    # true/false
+nl_template_args                = false    # true/false
+nl_template_end                 = false    # true/false
+nl_oc_msg_args                  = false    # true/false
+nl_oc_msg_args_min_params       = 0        # unsigned number
+nl_oc_msg_args_max_code_width   = 0        # unsigned number
+nl_fdef_brace                   = force    # ignore/add/remove/force/not_defined
+nl_fdef_brace_cond              = force    # ignore/add/remove/force/not_defined
+nl_cpp_ldef_brace               = remove   # ignore/add/remove/force/not_defined
+nl_return_expr                  = remove   # ignore/add/remove/force/not_defined
+nl_throw_expr                   = remove   # ignore/add/remove/force/not_defined
+nl_after_semicolon              = true     # true/false
+nl_paren_dbrace_open            = remove   # ignore/add/remove/force/not_defined
+nl_type_brace_init_lst          = force    # ignore/add/remove/force/not_defined
+nl_type_brace_init_lst_open     = force    # ignore/add/remove/force/not_defined
+nl_type_brace_init_lst_close    = force    # ignore/add/remove/force/not_defined
+nl_before_brace_open            = true     # true/false
+nl_after_brace_open             = true     # true/false
+nl_after_brace_open_cmt         = true     # true/false
+nl_after_vbrace_open            = true     # true/false
+nl_after_vbrace_open_empty      = true     # true/false
+nl_after_brace_close            = true     # true/false
+nl_after_vbrace_close           = true     # true/false
+nl_brace_struct_var             = remove   # ignore/add/remove/force/not_defined
+nl_define_macro                 = false    # true/false
+nl_squeeze_paren_close          = false    # true/false
+nl_squeeze_ifdef                = false    # true/false
+nl_squeeze_ifdef_top_level      = false    # true/false
+nl_before_if                    = ignore   # ignore/add/remove/force/not_defined
+nl_after_if                     = ignore   # ignore/add/remove/force/not_defined
+nl_before_for                   = ignore   # ignore/add/remove/force/not_defined
+nl_after_for                    = ignore   # ignore/add/remove/force/not_defined
+nl_before_while                 = ignore   # ignore/add/remove/force/not_defined
+nl_after_while                  = ignore   # ignore/add/remove/force/not_defined
+nl_before_switch                = ignore   # ignore/add/remove/force/not_defined
+nl_after_switch                 = ignore   # ignore/add/remove/force/not_defined
+nl_before_synchronized          = ignore   # ignore/add/remove/force/not_defined
+nl_after_synchronized           = ignore   # ignore/add/remove/force/not_defined
+nl_before_do                    = ignore   # ignore/add/remove/force/not_defined
+nl_after_do                     = ignore   # ignore/add/remove/force/not_defined
+nl_before_ignore_after_case     = false    # true/false
+nl_before_return                = false    # true/false
+nl_after_return                 = false    # true/false
+nl_before_member                = remove   # ignore/add/remove/force/not_defined
+nl_after_member                 = remove   # ignore/add/remove/force/not_defined
+nl_ds_struct_enum_cmt           = false    # true/false
+nl_ds_struct_enum_close_brace   = true     # true/false
+nl_class_colon                  = remove   # ignore/add/remove/force/not_defined
+nl_constr_colon                 = force    # ignore/add/remove/force/not_defined
+nl_namespace_two_to_one_liner   = false    # true/false
+nl_create_if_one_liner          = false    # true/false
+nl_create_for_one_liner         = false    # true/false
+nl_create_while_one_liner       = false    # true/false
+nl_create_func_def_one_liner    = false    # true/false
+nl_create_list_one_liner        = false    # true/false
+nl_split_if_one_liner           = true     # true/false
+nl_split_for_one_liner          = true     # true/false
+nl_split_while_one_liner        = true     # true/false
+donot_add_nl_before_cpp_comment = true    # true/false
+nl_max                          = 3        # unsigned number
+nl_max_blank_in_func            = 2        # unsigned number
+nl_inside_empty_func            = 1        # unsigned number
+nl_before_func_body_proto       = 0        # unsigned number
+nl_before_func_body_def         = 2        # unsigned number
+nl_before_func_class_proto      = 0        # unsigned number
+nl_before_func_class_def        = 0        # unsigned number
+nl_after_func_proto             = 0        # unsigned number
+nl_after_func_proto_group       = 2        # unsigned number
+nl_after_func_class_proto       = 0        # unsigned number
+nl_after_func_class_proto_group = 2        # unsigned number
+nl_class_leave_one_liner_groups = false    # true/false
+nl_after_func_body              = 2        # unsigned number
+nl_min_after_func_body          = 0        # unsigned number
+nl_max_after_func_body          = 0        # unsigned number
+nl_after_func_body_class        = 0        # unsigned number
+nl_after_func_body_one_liner    = 0        # unsigned number
+nl_typedef_blk_start            = 0        # unsigned number
+nl_typedef_blk_end              = 0        # unsigned number
+nl_typedef_blk_in               = 0        # unsigned number
+nl_var_def_blk_end_func_top     = 0        # unsigned number
+nl_var_def_blk_start            = 0        # unsigned number
+nl_var_def_blk_end              = 0        # unsigned number
+nl_var_def_blk_in               = 0        # unsigned number
+nl_before_block_comment         = 0        # unsigned number
+nl_before_c_comment             = 0        # unsigned number
+nl_before_cpp_comment           = 0        # unsigned number
+nl_after_multiline_comment      = false    # true/false
+nl_after_label_colon            = true     # true/false
+nl_before_struct                = 0        # unsigned number
+nl_after_struct                 = 2        # unsigned number
+nl_before_class                 = 2        # unsigned number
+nl_after_class                  = 2        # unsigned number
+nl_before_namespace             = 0        # unsigned number
+nl_inside_namespace             = 0        # unsigned number
+nl_after_namespace              = 2        # unsigned number
+nl_before_access_spec           = 2        # unsigned number
+nl_after_access_spec            = 1        # unsigned number
+nl_comment_func_def             = 0        # unsigned number
+nl_after_try_catch_finally      = 0        # unsigned number
+nl_around_cs_property           = 0        # unsigned number
+nl_between_get_set              = 0        # unsigned number
+nl_property_brace               = remove   # ignore/add/remove/force/not_defined
+eat_blanks_after_open_brace     = true     # true/false
+eat_blanks_before_close_brace   = true     # true/false
+nl_remove_extra_newlines        = 0        # unsigned number
+nl_after_annotation             = add      # ignore/add/remove/force/not_defined
+nl_between_annotation           = add      # ignore/add/remove/force/not_defined
+nl_before_whole_file_ifdef      = 0        # unsigned number
+nl_after_whole_file_ifdef       = 0        # unsigned number
+nl_before_whole_file_endif      = 0        # unsigned number
+nl_after_whole_file_endif       = 0        # unsigned number
+pos_arith                       = join     # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_assign                      = join     # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_bool                        = trail    # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_compare                     = join     # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_conditional                 = trail    # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_comma                       = trail    # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_enum_comma                  = trail    # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_class_comma                 = trail    # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_constr_comma                = trail    # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_class_colon                 = trail    # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_constr_colon                = trail   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+pos_shift                       = join     # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+code_width                      = 100      # unsigned number
+ls_for_split_full               = false    # true/false
+ls_func_split_full              = false    # true/false
+ls_code_width                   = false    # true/false
+align_keep_tabs                 = false    # true/false
+align_with_tabs                 = false    # true/false
+align_on_tabstop                = false    # true/false
+align_number_right              = true     # true/false
+align_keep_extra_space          = false    # true/false
+align_func_params               = false    # true/false
+align_func_params_span          = 0        # unsigned number
+align_func_params_thresh        = 0        # number
+align_func_params_gap           = 0        # unsigned number
+align_constr_value_span         = 0        # unsigned number
+align_constr_value_thresh       = 0        # number
+align_constr_value_gap          = 0        # unsigned number
+align_same_func_call_params     = false    # true/false
+align_same_func_call_params_span = 0        # unsigned number
+align_same_func_call_params_thresh = 0        # number
+align_var_def_span              = 1        # unsigned number
+align_var_def_star_style        = 2        # unsigned number
+align_var_def_amp_style         = 2        # unsigned number
+align_var_def_thresh            = 6        # number
+align_var_def_gap               = 0        # unsigned number
+align_var_def_colon             = true     # true/false
+align_var_def_colon_gap         = 0        # unsigned number
+align_var_def_attribute         = false    # true/false
+align_var_def_inline            = false    # true/false
+align_assign_span               = 1        # unsigned number
+align_assign_func_proto_span    = 0        # unsigned number
+align_assign_thresh             = 6        # number
+align_assign_on_multi_var_defs  = true     # true/false
+align_braced_init_list_span     = 1        # unsigned number
+align_braced_init_list_thresh   = 20       # number
+align_assign_decl_func          = 0        # unsigned number
+align_enum_equ_span             = 1        # unsigned number
+align_enum_equ_thresh           = 20       # number
+align_var_class_span            = 1        # unsigned number
+align_var_class_thresh          = 10       # number
+align_var_class_gap             = 0        # unsigned number
+align_var_struct_span           = 1        # unsigned number
+align_var_struct_thresh         = 10       # number
+align_var_struct_gap            = 0        # unsigned number
+align_struct_init_span          = 1        # unsigned number
+align_typedef_span              = 1        # unsigned number
+align_typedef_gap               = 0        # unsigned number
+align_typedef_func              = 2        # unsigned number
+align_typedef_star_style        = 2        # unsigned number
+align_typedef_amp_style         = 2        # unsigned number
+align_right_cmt_span            = 2        # unsigned number
+align_right_cmt_gap             = 0        # unsigned number
+align_right_cmt_mix             = false    # true/false
+align_right_cmt_same_level      = false    # true/false
+align_right_cmt_at_col          = 0        # unsigned number
+align_func_proto_span           = 1        # unsigned number
+align_func_proto_span_ignore_cont_lines = true # true/false
+align_func_proto_star_style     = 0        # unsigned number
+align_func_proto_amp_style      = 0        # unsigned number
+align_func_proto_thresh         = 0        # number
+align_func_proto_gap            = 1        # unsigned number
+align_on_operator               = true     # true/false
+align_mix_var_proto             = false    # true/false
+align_single_line_func          = false    # true/false
+align_single_line_brace         = false    # true/false
+align_single_line_brace_gap     = 0        # unsigned number
+align_oc_msg_spec_span          = 0        # unsigned number
+align_nl_cont                   = 1        #number
+align_nl_cont_spaces            = 1        # unsigned number
+align_pp_define_together        = true     # true/false
+align_pp_define_span            = 1        # unsigned number
+align_pp_define_gap             = 0        # unsigned number
+align_left_shift                = true     # true/false
+align_eigen_comma_init          = false    # true/false
+align_asm_colon                 = false    # true/false
+align_oc_msg_colon_span         = 0        # unsigned number
+align_oc_msg_colon_first        = false    # true/false
+align_oc_decl_colon             = false    # true/false
+align_oc_msg_colon_xcode_like   = false    # true/false
+cmt_width                       = 100      # unsigned number
+cmt_reflow_mode                 = 0        # unsigned number
+cmt_reflow_fold_regex_file      = ""         # string
+cmt_reflow_indent_to_paragraph_start = false    # true/false
+cmt_convert_tab_to_spaces       = false    # true/false
+cmt_indent_multi                = false    # true/false
+cmt_align_doxygen_javadoc_tags  = false    # true/false
+cmt_sp_before_doxygen_javadoc_tags = 1        # unsigned number
+cmt_trailing_single_line_c_to_cpp = true      # true/false
+cmt_c_group                     = false    # true/false
+cmt_c_nl_start                  = false    # true/false
+cmt_c_nl_end                    = false    # true/false
+cmt_cpp_to_c                    = false    # true/false
+cmt_cpp_group                   = false    # true/false
+cmt_cpp_nl_start                = false    # true/false
+cmt_cpp_nl_end                  = false    # true/false
+cmt_star_cont                   = false    # true/false
+cmt_sp_before_star_cont         = 0        # unsigned number
+cmt_sp_after_star_cont          = 0        # unsigned number
+cmt_multi_check_last            = true     # true/false
+cmt_multi_first_len_minimum     = 4        # unsigned number
+cmt_insert_file_header          = ""         # string
+cmt_insert_file_footer          = ""         # string
+cmt_insert_func_header          = ""         # string
+cmt_insert_class_header         = ""         # string
+cmt_insert_oc_msg_header        = ""         # string
+cmt_insert_before_preproc       = false    # true/false
+cmt_insert_before_inlines       = false    # true/false
+cmt_insert_before_ctor_dtor     = false    # true/false
+mod_full_brace_do               = add      # ignore/add/remove/force/not_defined
+mod_full_brace_for              = add      # ignore/add/remove/force/not_defined
+mod_full_brace_function         = add      # ignore/add/remove/force/not_defined
+mod_full_brace_if               = add      # ignore/add/remove/force/not_defined
+mod_full_brace_if_chain         = 0        # unsigned number
+mod_full_brace_if_chain_only    = false    # true/false
+mod_full_brace_while            = add      # ignore/add/remove/force/not_defined
+mod_full_brace_using            = add      # ignore/add/remove/force/not_defined
+mod_full_brace_nl               = 0        # unsigned number
+mod_full_brace_nl_block_rem_mlcond = false    # true/false
+mod_paren_on_return             = remove   # ignore/add/remove/force/not_defined
+mod_paren_on_throw              = force   # ignore/add/remove/force/not_defined
+mod_pawn_semicolon              = false    # true/false
+mod_full_paren_if_bool          = false    # true/false
+mod_full_paren_assign_bool      = false    # true/false
+mod_full_paren_return_bool      = false    # true/false
+mod_remove_extra_semicolon      = true     # true/false
+mod_remove_duplicate_include    = false    # true/false
+mod_add_force_c_closebrace_comment = false    # true/false
+mod_add_long_function_closebrace_comment = 0        # unsigned number
+mod_add_long_namespace_closebrace_comment = 0        # unsigned number
+mod_add_long_class_closebrace_comment = 0        # unsigned number
+mod_add_long_switch_closebrace_comment = 0        # unsigned number
+mod_add_long_ifdef_endif_comment = 0        # unsigned number
+mod_add_long_ifdef_else_comment = 0        # unsigned number
+mod_sort_case_sensitive         = false    # true/false
+mod_sort_import                 = false    # true/false
+mod_sort_using                  = false    # true/false
+mod_sort_include                = false    # true/false
+mod_sort_incl_import_prioritize_filename = false    # true/false
+mod_sort_incl_import_prioritize_extensionless = false    # true/false
+mod_sort_incl_import_prioritize_angle_over_quotes = false    # true/false
+mod_sort_incl_import_ignore_extension = false    # true/false
+mod_sort_incl_import_grouping_enabled = false    # true/false
+mod_move_case_break             = true     # true/false
+mod_move_case_return            = true     # true/false
+mod_case_brace                  = force    # ignore/add/remove/force/not_defined
+mod_remove_empty_return         = true     # true/false
+mod_enum_last_comma             = remove   # ignore/add/remove/force/not_defined
+mod_infinite_loop               = 0        # unsigned number
+mod_int_short                   = ignore   # ignore/add/remove/force/not_defined
+mod_short_int                   = ignore   # ignore/add/remove/force/not_defined
+mod_int_long                    = ignore   # ignore/add/remove/force/not_defined
+mod_long_int                    = ignore   # ignore/add/remove/force/not_defined
+mod_int_signed                  = ignore   # ignore/add/remove/force/not_defined
+mod_signed_int                  = ignore   # ignore/add/remove/force/not_defined
+mod_int_unsigned                = ignore   # ignore/add/remove/force/not_defined
+mod_unsigned_int                = ignore   # ignore/add/remove/force/not_defined
+mod_int_prefer_int_on_left      = false    # true/false
+mod_sort_oc_properties          = false    # true/false
+mod_sort_oc_property_class_weight = 0        # number
+mod_sort_oc_property_thread_safe_weight = 0        # number
+mod_sort_oc_property_readwrite_weight = 0        # number
+mod_sort_oc_property_reference_weight = 0        # number
+mod_sort_oc_property_getter_weight = 0        # number
+mod_sort_oc_property_setter_weight = 0        # number
+mod_sort_oc_property_nullability_weight = 0        # number
+pp_indent_with_tabs             = -1       # number
+pp_indent                       = force    # ignore/add/remove/force/not_defined
+pp_indent_at_level              = false    # true/false
+pp_indent_at_level0             = false    # true/false
+pp_indent_count                 = 2        # unsigned number
+pp_space_after                  = remove   # ignore/add/remove/force/not_defined
+pp_space_count                  = 0        # unsigned number
+pp_indent_region                = 0        # number
+pp_region_indent_code           = false    # true/false
+pp_indent_if                    = 0        # number
+pp_if_indent_code               = false    # true/false
+pp_indent_in_guard              = false    # true/false
+pp_define_at_level              = false    # true/false
+pp_include_at_level             = false    # true/false
+pp_ignore_define_body           = false    # true/false
+pp_multiline_define_body_indent = 2        # number
+pp_indent_case                  = false    # true/false
+pp_indent_func_def              = false    # true/false
+pp_indent_extern                = false    # true/false
+pp_indent_brace                 = 0        # number
+pp_warn_unbalanced_if           = true     # true/false
+include_category_0              = ""         # string
+include_category_1              = ""         # string
+include_category_2              = ""         # string
+use_indent_func_call_param      = true     # true/false
+use_indent_continue_only_once   = true     # true/false
+indent_cpp_lambda_only_once     = false    # true/false
+use_sp_after_angle_always       = false    # true/false
+use_options_overriding_for_qt_macros = true     # true/false
+use_form_feed_no_more_as_whitespace_character = false    # true/false
+warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
+debug_max_number_of_loops       = 0        # number
+debug_line_number_to_protocol   = 0        # number
+debug_timeout                   = 0        # number
+debug_truncate                  = 0        # unsigned number
+debug_sort_the_tracks           = true     # true/false
+debug_decode_the_flags          = false    # true/false
+set_numbering_for_html_output   = false    # true/false
+file_ext C   .c .c.cmake
+file_ext CPP .cpp .cxx .cc .h .hpp .hxx .hh .cpp.cmake .h.cmake .hpp.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/width-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/width-2.cfg
index 6c18a158..13a883c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/width-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/width-2.cfg
@@ -1,4 +1,5 @@
 # width stuff
+sp_sparen_brace                 = add
 sp_arith                        = force
 indent_columns                  = 4
 indent_with_tabs                = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/width-2.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/width-2.rerun.cfg
index c74e4020..c74e4020 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/common/width-2.rerun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/common/width-2.rerun.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/2185.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/2185.cfg
index fda2290c..fda2290c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/2185.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/2185.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/2203.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/2203.cfg
index e9c359cf..e9c359cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/2203.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/2203.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/623_caret-spacing.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/623_caret-spacing.cfg
index 4d60daa9..4d60daa9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/623_caret-spacing.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/623_caret-spacing.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/633_decl-in-func-typedef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/633_decl-in-func-typedef.cfg
index 0edd4124..0edd4124 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/633_decl-in-func-typedef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/633_decl-in-func-typedef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/DefaultAndDelete-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/DefaultAndDelete-0.cfg
index 8aef4713..8aef4713 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/DefaultAndDelete-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/DefaultAndDelete-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/DefaultAndDelete-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/DefaultAndDelete-1.cfg
index f97e0abe..f97e0abe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/DefaultAndDelete-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/DefaultAndDelete-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/DefaultAndDelete-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/DefaultAndDelete-2.cfg
index 6c39bace..6c39bace 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/DefaultAndDelete-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/DefaultAndDelete-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Discussion_3987.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Discussion_3987.cfg
new file mode 100644
index 00000000..5b27f6e1
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Discussion_3987.cfg
@@ -0,0 +1,2 @@
+mod_add_long_function_closebrace_comment = 3
+mod_add_force_c_closebrace_comment       = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/I1112-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/I1112-2.cfg
index 6b1bba41..6b1bba41 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/I1112-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/I1112-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/I2103.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/I2103.cfg
index 5c34ca18..5c34ca18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/I2103.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/I2103.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1052.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1052.cfg
index 91fe8899..91fe8899 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1052.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1052.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1130.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1130.cfg
new file mode 100644
index 00000000..ff3f1c4e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1130.cfg
@@ -0,0 +1,6 @@
+indent_with_tabs = 0
+# How to indent the continuation of ternary operator.
+#     0: Off (default)
+#     1: When the `if_false` is a continuation, indent it under `if_false`
+#     2: When the `:` is a continuation, indent it under `?`
+indent_ternary_operator = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1167.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1167.cfg
index feb56c83..feb56c83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1167.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1167.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1184.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1184.cfg
index 0fdd95de..0fdd95de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1184.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1184.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1460.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1460.cfg
index 7adee60a..7adee60a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1460.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1460.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1511.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1511.cfg
index 71c01f4d..71c01f4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1511.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1511.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1692.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1692.cfg
index db3cbdbe..db3cbdbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1692.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1692.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1703.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1703.cfg
index f8c889ab..f8c889ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1703.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1703.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1734.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1734.cfg
index 37a4c192..37a4c192 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1734.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1734.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1753.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1753.cfg
index e0e5ab0b..e0e5ab0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1753.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1753.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1813.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1813.cfg
index ff1ce9d3..ff1ce9d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1813.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1813.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1923.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1923.cfg
index f242e902..f242e902 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1923.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1923.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1966.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1966.cfg
index be3a873d..be3a873d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_1966.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_1966.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2020.cfg
index 2104e036..2104e036 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2020.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2020.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2045.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2045.cfg
index 3fb7cfe9..3fb7cfe9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2045.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2045.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2085.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2085.cfg
index 2df8ebd8..2df8ebd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2085.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2085.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2091.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2091.cfg
index 898b035b..898b035b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2091.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2091.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2101.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2101.cfg
index 44e5a0e6..44e5a0e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2101.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2101.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2149.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2149.cfg
index 721daf0b..721daf0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2149.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2149.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2150.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2150.cfg
index 5f518291..5f518291 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2150.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2150.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2151.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2151.cfg
index 0660e498..0660e498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2151.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2151.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2163.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2163.cfg
index b7c31fe2..b7c31fe2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2163.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2163.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2166.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2166.cfg
index 2b473436..2b473436 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2166.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2166.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2170.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2170.cfg
index f66f0022..f66f0022 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2170.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2170.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2186.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2186.cfg
index d694b699..d694b699 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2186.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2186.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2195.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2195.cfg
index 0c70840d..0c70840d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2195.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2195.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2219.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2219.cfg
index 865142a1..865142a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2219.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2219.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2224.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2224.cfg
index 8973a14f..07cef5af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2224.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2224.cfg
@@ -1,3 +1,4 @@
+sp_after_sparen                 = add
 output_tab_size                 = 4
 indent_columns                  = 4
 nl_create_if_one_liner          = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2229.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2229.cfg
index 38cb5554..38cb5554 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2229.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2229.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2232.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2232.cfg
index 06730341..06730341 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2232.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2232.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2236.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2236.cfg
index 6d30f256..6d30f256 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2236.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2236.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2250.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2250.cfg
index 705176b2..705176b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2250.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2250.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2281.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2281.cfg
index 1d8b164e..1d8b164e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2281.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2281.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2302.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2302.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2302.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2302.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2305.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2305.cfg
index 7200d9ac..7200d9ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2305.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2305.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2319.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2319.cfg
index aeb132b5..aeb132b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2319.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2319.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2343.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2343.cfg
index 955a1f9a..955a1f9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2343.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2343.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2345.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2345.cfg
index 27213b45..27213b45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2345.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2345.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2368.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2368.cfg
index d1496108..d1496108 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2368.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2368.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2383.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2383.cfg
index 313d9efb..313d9efb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2383.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2383.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2386.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2386.cfg
index 3a121c2e..3a121c2e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2386.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2386.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2428.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2428.cfg
index 8af28414..8af28414 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2428.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2428.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2437.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2437.cfg
index b21679ce..b21679ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2437.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2437.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2440.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2440.cfg
index 3da56066..3da56066 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2440.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2440.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2440_nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2440_nl.cfg
index 3da56066..3da56066 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2440_nl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2440_nl.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2478.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2478.cfg
index bb4425d9..bb4425d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2478.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2478.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2561.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2561.cfg
index 03a40504..03a40504 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2561.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2561.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2570.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2570.cfg
index 6a9f2d25..6a9f2d25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2570.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2570.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2574.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2574.cfg
index d96f0980..d96f0980 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2574.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2574.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2582.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2582.cfg
index f634b12e..f634b12e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2582.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2582.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2591.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2591.cfg
index 6ca8934c..6ca8934c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2591.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2591.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2594.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2594.cfg
index 1d7941be..1d7941be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2594.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2594.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2596.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2596.cfg
index b6338859..b6338859 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2596.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2596.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2604.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2604.cfg
index daeb9bc6..daeb9bc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2604.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2604.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2668.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2668.cfg
index 40a69dcf..40a69dcf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2668.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2668.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2688.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2688.cfg
index 4baf4b3f..4baf4b3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2688.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2688.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2689.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2689.cfg
index e498e830..e498e830 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2689.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2689.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2692.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2692.cfg
index bce2060e..bce2060e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2692.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2692.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2703.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2703.cfg
index ed7b8ddb..ed7b8ddb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2703.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2703.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2734.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2734.cfg
index 83fdd868..83fdd868 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2734.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2734.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2735.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2735.cfg
index 32a72aa2..32a72aa2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2735.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2735.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2742.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2742.cfg
index eba0468c..eba0468c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2742.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2742.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2752.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2752.cfg
index e15e7702..e15e7702 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2752.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2752.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2757.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2757.cfg
index e2118df5..e2118df5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2757.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2757.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2758.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2758.cfg
index dd2d0f6b..dd2d0f6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2758.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2758.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2759.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2759.cfg
index abdc53f4..abdc53f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2759.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2759.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2771.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2771.cfg
index b34e82a7..b34e82a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2771.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2771.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2794.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2794.cfg
index c193054f..c193054f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2794.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2794.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2795.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2795.cfg
index 353cafa8..353cafa8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2795.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2795.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2823.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2823.cfg
index de58e056..de58e056 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2823.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2823.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2831.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2831.cfg
index e7271af0..e7271af0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2831.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2831.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2836.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2836.cfg
index 41151a57..41151a57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2836.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2836.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2873.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2873.cfg
index be881c98..be881c98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2873.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2873.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2879.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2879.cfg
index ba98f974..ba98f974 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2879.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2879.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2886.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2886.cfg
index eb4b5ca2..eb4b5ca2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2886.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2886.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2890.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2890.cfg
index 81ba72ca..81ba72ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2890.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2890.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2902.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2902.cfg
index 5806b371..5806b371 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2902.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2902.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2907.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2907.cfg
index fa5b3018..fa5b3018 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2907.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2907.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2914.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2914.cfg
index 98d4511c..98d4511c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2914.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2914.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2921.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2921.cfg
index 142dc8dc..142dc8dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2921.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2921.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2930.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2930.cfg
index bd8cb9b0..bd8cb9b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2930.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2930.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2942.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2942.cfg
index e72ddc77..e72ddc77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2942.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2942.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2949.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2949.cfg
index b5ea1ffb..b5ea1ffb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2949.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2949.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2957.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2957.cfg
index aaf2b1a1..aaf2b1a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2957.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2957.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2971.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2971.cfg
index 1255b541..1255b541 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_2971.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_2971.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3010.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3010.cfg
index 5f518291..5f518291 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3010.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3010.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3025.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3025.cfg
index 5e545c50..5e545c50 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3025.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3025.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3034.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3034.cfg
index 77557ac3..77557ac3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3034.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3034.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3040.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3040.cfg
index 12c8ebaf..12c8ebaf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3040.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3040.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3044.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3044.cfg
index c2f9ade5..c2f9ade5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3044.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3044.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3048.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3048.cfg
index fb4171d7..fb4171d7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3048.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3048.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3054-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3054-2.cfg
index a41640f0..a41640f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3054-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3054-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3054.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3054.cfg
index a88303ba..a88303ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3054.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3054.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3055.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3055.cfg
index ccf5c75f..ccf5c75f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3055.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3055.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3058.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3058.cfg
index 1619b851..1619b851 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3058.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3058.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3061_0nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3061_0nl.cfg
index 53a71184..53a71184 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3061_0nl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3061_0nl.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3061_1nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3061_1nl.cfg
index ad1c0bbc..ad1c0bbc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3061_1nl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3061_1nl.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3061_2nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3061_2nl.cfg
index 27325b31..27325b31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3061_2nl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3061_2nl.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3061_3nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3061_3nl.cfg
index 276c7d72..276c7d72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3061_3nl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3061_3nl.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3080.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3080.cfg
index 748a6dad..748a6dad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3080.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3080.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3097.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3097.cfg
index ed31649e..ed31649e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3097.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3097.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3164.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3164.cfg
index 10cf639b..10cf639b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3164.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3164.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3197.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3197.cfg
index 2177bfff..2177bfff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3197.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3197.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3198.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3198.cfg
index 28852f24..28852f24 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3198.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3198.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3203.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3203.cfg
index 69cd5054..69cd5054 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3203.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3203.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3220-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3220-f.cfg
index fffa496d..fffa496d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3220-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3220-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3220-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3220-i.cfg
index 52060d80..52060d80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3220-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3220-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3220-ir.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3220-ir.cfg
index 17d298b2..63c52660 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3220-ir.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3220-ir.cfg
@@ -9,3 +9,4 @@ sp_before_ptr_star_trailing = ignore
 sp_before_unnamed_ptr_star  = ignore
 sp_between_ptr_star         = ignore
 sp_ptr_star_paren           = ignore
+sp_before_ptr_star          = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3220-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3220-r.cfg
index c62cb16e..c62cb16e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3220-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3220-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3236.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3236.cfg
new file mode 100644
index 00000000..51a54f89
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3236.cfg
@@ -0,0 +1,3 @@
+# Whether to fully parenthesize Boolean expressions in 'while' and 'if'
+# statement, as in 'if (a && b > c)' => 'if (a && (b > c))'.
+mod_full_paren_if_bool = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3237.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3237.cfg
index 5c47913d..5c47913d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3237.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3237.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3252.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3252.cfg
index db7fe8f2..db7fe8f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3252.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3252.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3284.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3284.cfg
index 51de787c..51de787c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3284.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3284.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3294.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3294.cfg
index 994a3fe7..994a3fe7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3294.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3294.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3309-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3309-f.cfg
index 2c88f416..2c88f416 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3309-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3309-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3309-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3309-i.cfg
index fc7534fe..fc7534fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3309-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3309-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3309-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3309-r.cfg
index aa884661..aa884661 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3309-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3309-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3316.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3316.cfg
index 901ad6e4..901ad6e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3316.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3316.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3357.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3357.cfg
index 3f3c5075..3f3c5075 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3357.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3357.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3409.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3409.cfg
index b8424b25..b8424b25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3409.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3409.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3413.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3413.cfg
index 99a9f4a9..99a9f4a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3413.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3413.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3422-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3422-1.cfg
index 6c86f2db..6c86f2db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3422-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3422-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3422-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3422-2.cfg
index beb76fde..beb76fde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3422-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3422-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3428.cfg
index d9f9789c..d9f9789c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3428.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3428_2.cfg
index 4e750218..4e750218 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3428_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3428_3.cfg
index c404d45b..c404d45b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3428_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3428_4.cfg
index e3078665..e3078665 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428_4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3428_4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428_5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3428_5.cfg
index 6d0a4c77..6d0a4c77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428_5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3428_5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428_6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3428_6.cfg
index 30b78a65..30b78a65 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3428_6.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3428_6.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3446.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3446.cfg
index a66901cc..a66901cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3446.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3446.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3448.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3448.cfg
index 77619e74..77619e74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3448.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3448.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3513.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3513.cfg
index 34f93540..34f93540 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3513.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3513.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3546.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3546.cfg
index 56965ae8..56965ae8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3546.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3546.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3550.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3550.cfg
index 1a4502fa..1a4502fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3550.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3550.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3552.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3552.cfg
index f9a0eca8..f9a0eca8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3552.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3552.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3558.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3558.cfg
index 7999dcbf..7999dcbf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3558.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3558.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3570.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3570.cfg
index f291c20d..f291c20d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3570.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3570.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3576-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3576-a.cfg
index 052cf16f..052cf16f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3576-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3576-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3576-b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3576-b.cfg
index 2b187f20..2b187f20 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3576-b.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3576-b.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3604.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3604.cfg
index 5806b371..5806b371 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3604.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3604.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3614.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3614.cfg
new file mode 100644
index 00000000..f3b66508
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3614.cfg
@@ -0,0 +1,2 @@
+sp_cmt_cpp_start = force
+sp_cmt_cpp_lint  = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3710.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3710.cfg
index 46339ba3..46339ba3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3710.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3710.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3785.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3785.cfg
index 64f056a5..64f056a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3785.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3785.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3786.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3786.cfg
index c5c081aa..c5c081aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3786.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3786.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3786.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3786.rerun.cfg
index c514c32c..c514c32c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3786.rerun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3786.rerun.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3863.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3863.cfg
index eb716a45..eb716a45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_3863.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3863.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3865.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3865.cfg
new file mode 100644
index 00000000..33384989
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3865.cfg
@@ -0,0 +1 @@
+sp_arith = add

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3865_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3865_2.cfg
new file mode 100644
index 00000000..4c4ef95a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3865_2.cfg
@@ -0,0 +1,2 @@
+sp_arith        = add

+sp_before_byref = remove
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3914.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3914.cfg
new file mode 100644
index 00000000..fc8c28ff
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3914.cfg
@@ -0,0 +1,5 @@
+nl_func_call_paren              = remove
+
+sp_func_call_user_inside_rparen = force
+sp_inside_rparens               = force
+sp_inside_rparen                = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3915.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3915.cfg
new file mode 100644
index 00000000..59662afb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3915.cfg
@@ -0,0 +1 @@
+indent_member_single = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3916.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3916.cfg
new file mode 100644
index 00000000..dbc91f40
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3916.cfg
@@ -0,0 +1,2 @@
+indent_with_tabs            = 0
+align_same_func_call_params = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3919.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3919.cfg
new file mode 100644
index 00000000..7715cb13
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3919.cfg
@@ -0,0 +1,2 @@
+sp_cmt_cpp_start = add
+sp_cmt_cpp_pvs   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3920.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3920.cfg
new file mode 100644
index 00000000..6a9f2d25
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3920.cfg
@@ -0,0 +1 @@
+mod_remove_extra_semicolon = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3965.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3965.cfg
new file mode 100644
index 00000000..84ffaf1e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3965.cfg
@@ -0,0 +1,2 @@
+indent_columns = 4
+nl_end_of_file = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3967.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3967.cfg
new file mode 100644
index 00000000..b5ea1ffb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3967.cfg
@@ -0,0 +1 @@
+indent_columns = 4
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3983.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3983.cfg
new file mode 100644
index 00000000..9c2f9036
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_3983.cfg
@@ -0,0 +1 @@
+indent_member_single=true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_4036.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_4036.cfg
new file mode 100644
index 00000000..0880c62f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_4036.cfg
@@ -0,0 +1,2 @@
+sp_after_bit_colon  = remove
+sp_before_bit_colon = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_4080.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_4080.cfg
new file mode 100644
index 00000000..faf107eb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_4080.cfg
@@ -0,0 +1 @@
+sp_before_ptr_star = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_4094.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_4094.cfg
new file mode 100644
index 00000000..0b717219
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_4094.cfg
@@ -0,0 +1,2 @@
+sp_cpp_lambda_argument_list_empty = force
+sp_cpp_lambda_argument_list       = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_4239.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_4239.cfg
new file mode 100644
index 00000000..0988ac8b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_4239.cfg
@@ -0,0 +1,5 @@
+# Whether to fully parenthesize Boolean expressions after '='
+# statement, as in 'x = a && b > c;' => 'x = (a && (b > c));'.
+mod_full_paren_assign_bool = true
+
+indent_with_tabs           = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_750.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_750.cfg
index b22aff36..b22aff36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_750.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_750.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_931.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_931.cfg
index 45879950..45879950 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_931.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_931.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_995-do.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_995-do.cfg
index ba4e6387..ba4e6387 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Issue_995-do.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Issue_995-do.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/NewLine-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/NewLine-f.cfg
index 8da1e530..8da1e530 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/NewLine-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/NewLine-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/NewLine-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/NewLine-r.cfg
index 329f5112..329f5112 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/NewLine-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/NewLine-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/STUCK_macro-difficulties.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/STUCK_macro-difficulties.cfg
index c7ce0fd8..c7ce0fd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/STUCK_macro-difficulties.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/STUCK_macro-difficulties.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U02-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U02-Cpp.cfg
index e8b4846a..e8b4846a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U02-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U02-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U03-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U03-Cpp.cfg
index d0f33089..d0f33089 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U03-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U03-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U04-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U04-Cpp.cfg
index 75f78b42..75f78b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U04-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U04-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U05-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U05-Cpp.cfg
index ac01c51c..ac01c51c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U05-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U05-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U06-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U06-Cpp.cfg
index 55fcc716..55fcc716 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U06-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U06-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U07-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U07-Cpp.cfg
index 9cee7fef..9cee7fef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U07-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U07-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U16-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U16-Cpp.cfg
index 425ee375..425ee375 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U16-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U16-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U18-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U18-Cpp.cfg
index 75f78b42..75f78b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U18-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U18-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U21-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U21-Cpp.cfg
index fd27114f..fd27114f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U21-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U21-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U23-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U23-Cpp.cfg
index 04863187..04863187 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U23-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U23-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U25-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U25-Cpp.cfg
index 75f78b42..75f78b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U25-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U25-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U26-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U26-Cpp.cfg
index 39c58934..39c58934 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U26-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U26-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U27-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U27-Cpp.cfg
index e8b4846a..e8b4846a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U27-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U27-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U28-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U28-Cpp.cfg
index ac01c51c..ac01c51c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U28-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U28-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U29-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U29-Cpp.cfg
index d65f6b27..d65f6b27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U29-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U29-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U30-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U30-Cpp.cfg
index 75f78b42..75f78b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U30-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U30-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U31-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U31-Cpp.cfg
index bd45658a..bd45658a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U31-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U31-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U33-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U33-Cpp.cfg
index 0d78de45..0d78de45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U33-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U33-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U36-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U36-Cpp.cfg
index b655be2c..b655be2c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/U36-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/U36-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-10496.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-10496.cfg
index 42f6ee64..42f6ee64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-10496.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-10496.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-12046.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-12046.cfg
index 4dcd62eb..4dcd62eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-12046.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-12046.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1340.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-1340.cfg
index 8a43dca1..8a43dca1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1340.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-1340.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1344.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-1344.cfg
index 9e9937d2..9e9937d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1344.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-1344.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1346.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-1346.cfg
index 4074ff52..4074ff52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1346.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-1346.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1347.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-1347.cfg
index ee4173ec..ee4173ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1347.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-1347.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1350.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-1350.cfg
index 082a647f..082a647f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1350.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-1350.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1356.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-1356.cfg
index 948f20b6..948f20b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1356.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-1356.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1358.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-1358.cfg
index 0d78de45..0d78de45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-1358.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-1358.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-2049.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-2049.cfg
index f075ea03..f075ea03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-2049.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-2049.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-2650.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-2650.cfg
index 46279443..46279443 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-2650.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-2650.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-2680.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-2680.cfg
index 99790699..99790699 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-2680.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-2680.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-29935.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-29935.cfg
index 28d338ee..23ce45ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-29935.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-29935.cfg
@@ -29,6 +29,7 @@ sp_sparen_brace                 = force
 sp_special_semi                 = force
 sp_before_semi_for              = remove
 sp_before_semi_for_empty        = remove
+sp_before_byref_func            = force
 sp_between_semi_for_empty       = remove
 sp_after_semi_for_empty         = remove
 sp_before_square                = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-30088.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-30088.cfg
index 4abe03e1..4abe03e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-30088.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-30088.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-32657.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-32657.cfg
index 775b6abb..8903de5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/UNI-32657.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/UNI-32657.cfg
@@ -156,7 +156,7 @@ align_on_operator=false
 align_mix_var_proto=false
 align_single_line_func=false
 align_single_line_brace=false
-align_nl_cont=false
+align_nl_cont=0
 align_left_shift=false
 nl_collapse_empty_body=false
 nl_assign_leave_one_liners=true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Uncrustify.Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Uncrustify.Cpp.cfg
index 89855c3c..89855c3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/Uncrustify.Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/Uncrustify.Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/al.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/al.cfg
index 669cef45..669cef45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/al.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/al.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align-330.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align-330.cfg
index 2b1e6107..5cae649c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align-330.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align-330.cfg
@@ -2,7 +2,7 @@ sp_after_comma                  = force
 indent_columns                  = 3
 pp_multiline_define_body_indent = 3
 nl_class_colon                  = force
-align_nl_cont                   = true
+align_nl_cont                   = 1
 align_pp_define_gap             = 4
 align_pp_define_span            = 3
 indent_with_tabs                = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_assign_decl_func-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_assign_decl_func-0.cfg
index fee6fea1..fee6fea1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_assign_decl_func-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_assign_decl_func-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_assign_decl_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_assign_decl_func-1.cfg
index 2175c1e2..2175c1e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_assign_decl_func-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_assign_decl_func-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_assign_decl_func-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_assign_decl_func-2.cfg
index 9e3a2779..9e3a2779 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_assign_decl_func-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_assign_decl_func-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_assign_func_proto_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_assign_func_proto_1.cfg
index 378039a7..378039a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_assign_func_proto_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_assign_func_proto_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_assign_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_assign_span-1.cfg
index fda177f9..fda177f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_assign_span-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_assign_span-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_asterisk_after_type_cast.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_asterisk_after_type_cast.cfg
index 4a781152..4a781152 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_asterisk_after_type_cast.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_asterisk_after_type_cast.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_class-constr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_class-constr.cfg
index 8824d97a..8824d97a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_class-constr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_class-constr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_continuation_left_shift.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_continuation_left_shift.cfg
index 767f2adc..767f2adc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_continuation_left_shift.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_continuation_left_shift.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_default_after_override.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_default_after_override.cfg
index 7373e8d1..7373e8d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_default_after_override.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_default_after_override.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_eigen_comma_init.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_eigen_comma_init.cfg
index a798cc5f..a798cc5f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_eigen_comma_init.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_eigen_comma_init.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_fcall-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_fcall-2.cfg
index 795a16e9..795a16e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_fcall-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_fcall-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_fcall.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_fcall.cfg
index 2df9b2e0..2df9b2e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_fcall.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_fcall.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_params-t.cfg
index 6072ca53..6072ca53 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_params-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_gap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_params_gap.cfg
index 314c2e1b..314c2e1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_gap.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_params_gap.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_params_span-1.cfg
index 5695e5a4..5695e5a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_span-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_params_span-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_thresh_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_params_thresh_1.cfg
index acae1cc7..acae1cc7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_thresh_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_params_thresh_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_params_thresh_2.cfg
index 355705f1..355705f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_thresh_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_params_thresh_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_thresh_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_params_thresh_3.cfg
index 48912fce..48912fce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_thresh_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_params_thresh_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_thresh_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_params_thresh_4.cfg
index 284a5ee8..284a5ee8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_params_thresh_4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_params_thresh_4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_proto_thresh_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_proto_thresh_1.cfg
index b6a93b5b..b6a93b5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_proto_thresh_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_proto_thresh_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_proto_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_proto_thresh_2.cfg
index 363ea06c..363ea06c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_proto_thresh_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_proto_thresh_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_proto_thresh_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_proto_thresh_3.cfg
index 3a5ac106..3a5ac106 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_proto_thresh_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_proto_thresh_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_proto_thresh_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_proto_thresh_4.cfg
index 6b084d86..6b084d86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_proto_thresh_4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_proto_thresh_4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_proto_thresh_5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_proto_thresh_5.cfg
index 8a8dff6b..8a8dff6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_func_proto_thresh_5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_func_proto_thresh_5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_right_comment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_right_comment.cfg
index 1551b394..1551b394 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_right_comment.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_right_comment.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_var_class_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_var_class_span-1.cfg
index a1b4122c..a1b4122c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_var_class_span-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_var_class_span-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_var_def_thresh_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_var_def_thresh_1.cfg
index 5cadc402..5cadc402 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_var_def_thresh_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_var_def_thresh_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_var_def_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_var_def_thresh_2.cfg
index bb9be8ad..bb9be8ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_var_def_thresh_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_var_def_thresh_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_var_def_thresh_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_var_def_thresh_3.cfg
index edb77f43..edb77f43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/align_var_def_thresh_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/align_var_def_thresh_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/anonymous_enum.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/anonymous_enum.cfg
index 503a2cb5..503a2cb5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/anonymous_enum.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/anonymous_enum.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/arith-vs-byref.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/arith-vs-byref.cfg
index 006060ca..006060ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/arith-vs-byref.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/arith-vs-byref.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/arith-vs-ptr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/arith-vs-ptr.cfg
index 60c8d23c..60c8d23c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/arith-vs-ptr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/arith-vs-ptr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/asm_block_pp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/asm_block_pp.cfg
index dd9eb164..dd9eb164 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/asm_block_pp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/asm_block_pp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/avalon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/avalon.cfg
index aef9ed44..45accdc7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/avalon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/avalon.cfg
@@ -1,3 +1,4 @@
+sp_sparen_brace               = add
 sp_before_byref               = remove
 sp_before_byref_func          = remove
 sp_before_square              = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/avalon2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/avalon2.cfg
index 97783b66..aa0644cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/avalon2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/avalon2.cfg
@@ -1,4 +1,6 @@
+sp_sparen_brace                 = add
 sp_before_ptr_star              = remove
+sp_between_ptr_ref              = remove
 sp_before_byref                 = remove
 sp_before_angle                 = remove
 sp_inside_angle                 = remove
@@ -8,4 +10,4 @@ sp_angle_word                   = force
 sp_before_square                = force
 indent_columns                  = 2
 nl_if_brace                     = remove
-nl_after_func_proto_group       = 2
\ No newline at end of file
+nl_after_func_proto_group       = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/avalon3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/avalon3.cfg
index 30f50cb7..30f50cb7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/avalon3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/avalon3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/avalon4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/avalon4.cfg
index 1577d2b3..ab173208 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/avalon4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/avalon4.cfg
@@ -1,3 +1,4 @@
+sp_sparen_brace             = add
 sp_before_ptr_star          = remove
 sp_after_ptr_star           = force
 sp_before_angle             = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_001.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_001.cfg
index e1bce1fa..e1bce1fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_001.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_001.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_003.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_003.cfg
index b6dffc7c..b6dffc7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_003.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_003.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_004.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_004.cfg
index fa3c13c3..fa3c13c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_004.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_004.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_005.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_005.cfg
index 6784d5f8..6784d5f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_005.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_005.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_006.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_006.cfg
index 2767d063..2767d063 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_006.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_006.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_008.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_008.cfg
index ac567894..ac567894 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_008.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_008.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_009.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_009.cfg
index 314bb848..314bb848 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_009.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_009.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_010.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_010.cfg
index c4536db3..c4536db3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_010.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_010.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_012.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_012.cfg
index 73c218c5..73c218c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_012.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_012.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_013.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_013.cfg
index be76962d..be76962d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_013.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_013.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_014.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_014.cfg
index 95250f61..95250f61 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_014.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_014.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_015.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_015.cfg
index 0e139678..0e139678 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_015.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_015.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_016.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_016.cfg
index 9b863f1d..9b863f1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_016.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_016.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_017.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_017.cfg
index a4acecc3..a4acecc3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_017.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_017.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_018.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_018.cfg
index c8dd1ab6..c8dd1ab6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_018.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_018.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_020.cfg
index 8cd270ef..8cd270ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_020.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_020.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_021.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_021.cfg
index e8024afb..e8024afb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_021.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_021.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_022.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_022.cfg
index e258b9a3..e258b9a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_022.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_022.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_023.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_023.cfg
index acb9b682..acb9b682 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_023.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_023.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_024.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_024.cfg
index 37954be0..37954be0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_024.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_024.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_026.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_026.cfg
index f7008ee3..f7008ee3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_026.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_026.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_027.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_027.cfg
index fbbdb06a..fbbdb06a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_027.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_027.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_028.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_028.cfg
index 62848095..62848095 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_028.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_028.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_029.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_029.cfg
index a0c2e18c..a0c2e18c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_029.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_029.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_030.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_030.cfg
index 8663afd4..8663afd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ben_030.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_030.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_031.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_031.cfg
new file mode 100644
index 00000000..97dc5912
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ben_031.cfg
@@ -0,0 +1,6 @@
+sp_after_bit_colon  = force
+sp_before_bit_colon = force
+indent_columns      = 3
+indent_class        = true
+indent_label        = 2
+indent_access_spec  = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1001.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1001.cfg
index d8255ca7..d8255ca7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1001.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1001.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1003.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1003.cfg
index 242b3a13..242b3a13 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1003.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1003.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1004.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1004.cfg
index f479bada..f479bada 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1004.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1004.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1020.cfg
index 51643e87..51643e87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1020.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1020.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1108.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1108.cfg
index 741ba79d..741ba79d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1108.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1108.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1160.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1160.cfg
index afc7030d..afc7030d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1160.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1160.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1161.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1161.cfg
index c7977cf0..c7977cf0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1161.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1161.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1169.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1169.cfg
index 0615b330..0615b330 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1169.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1169.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1170.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1170.cfg
index 9171180b..9171180b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1170.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1170.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1236.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1236.cfg
index 0c60d5be..0c60d5be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1236.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1236.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1296-F.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1296-F.cfg
index 613f85d5..613f85d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1296-F.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1296-F.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1296-T.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1296-T.cfg
index 82a970ff..82a970ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1296-T.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1296-T.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1315.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1315.cfg
index 49a716d0..49a716d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1315.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1315.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1324.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1324.cfg
index 289ca9d5..289ca9d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1324.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1324.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1340.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1340.cfg
index 6ec6568e..6ec6568e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1340.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1340.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1349.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1349.cfg
index abe4253c..56328317 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1349.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1349.cfg
@@ -1,3 +1,4 @@
 indent_columns                  = 4
 code_width                      = 115
-align_struct_init_span          = 5
\ No newline at end of file
+align_struct_init_span          = 5
+nl_type_brace_init_lst          = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1395.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1395.cfg
index c2bed595..c2bed595 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1395.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1395.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1402.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1402.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1402.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1402.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1403.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1403.cfg
index 8e10acd4..8e10acd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1403.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1403.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1432.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1432.cfg
index 4ae27492..4ae27492 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1432.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1432.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1439.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1439.cfg
index f625249d..f625249d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1439.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1439.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1452.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1452.cfg
index dbd0e9b4..dbd0e9b4 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1452.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1452.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1649.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1649.cfg
index 472975ab..472975ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1649.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1649.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1689.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1689.cfg
index 7c1462f1..7c1462f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1689.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1689.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1691.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1691.cfg
index 03600f80..03600f80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1691.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1691.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1717.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1717.cfg
index a6c7322f..a6c7322f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1717.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1717.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1758-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1758-f.cfg
index 90d17ebd..90d17ebd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1758-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1758-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1854.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1854.cfg
index ebc5c5e3..ebc5c5e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1854.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1854.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1862.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1862.cfg
index c23b9027..c23b9027 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_1862.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_1862.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2285.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_2285.cfg
index fa3b437b..fa3b437b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2285.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_2285.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2322.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_2322.cfg
index a16bec3d..a16bec3d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2322.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_2322.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2371.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_2371.cfg
index 1f207beb..1f207beb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2371.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_2371.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2402.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_2402.cfg
index 85c3a458..85c3a458 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2402.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_2402.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2433_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_2433_1.cfg
index 17fd04a4..17fd04a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2433_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_2433_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2433_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_2433_2.cfg
index 89f0b916..89f0b916 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_2433_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_2433_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_472.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_472.cfg
index 68d6f99b..68d6f99b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_472.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_472.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_488.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_488.cfg
index 0319ef54..0319ef54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_488.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_488.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_633.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_633.cfg
index 61833884..61833884 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_633.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_633.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_657.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_657.cfg
index 109e3750..109e3750 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_657.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_657.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_664.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_664.cfg
index 3799bd89..3799bd89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_664.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_664.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_670.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_670.cfg
index fe57c0af..fe57c0af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_670.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_670.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_858-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_858-f.cfg
index 1f03334a..1f03334a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_858-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_858-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_858-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_858-r.cfg
index 82e3cb22..82e3cb22 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_858-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_858-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_322.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_i_322.cfg
index e49770be..e49770be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_322.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_i_322.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_359.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_i_359.cfg
index ab9c63fb..ab9c63fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_359.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_i_359.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_405.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_i_405.cfg
index 0bdfce99..0bdfce99 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_405.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_i_405.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_409-create.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_i_409-create.cfg
index ec0f6ca4..936b04a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_409-create.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_i_409-create.cfg
@@ -1,3 +1,4 @@
+sp_after_sparen                 = add
 nl_create_if_one_liner          = true
 nl_create_for_one_liner         = true
 nl_create_while_one_liner       = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_409-split.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_i_409-split.cfg
index 9e272905..9e272905 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_409-split.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_i_409-split.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_478.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_i_478.cfg
index 18db9a6d..18db9a6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_478.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_i_478.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_663.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_i_663.cfg
index 9d780855..9d780855 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_663.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_i_663.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_666.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_i_666.cfg
index 6acabd49..6acabd49 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_666.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_i_666.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_752.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_i_752.cfg
index 93191dc0..93191dc0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/bug_i_752.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/bug_i_752.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-center.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/byref-center.cfg
index 5d370736..5d370736 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-center.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/byref-center.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/byref-f.cfg
index a50d0c1a..a50d0c1a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/byref-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/byref-i.cfg
index 9d15782c..9d15782c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/byref-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-ir.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/byref-ir.cfg
index df89f6e3..df89f6e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-ir.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/byref-ir.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-left.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/byref-left.cfg
index d28c4e5e..d28c4e5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-left.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/byref-left.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/byref-r.cfg
index 505f9dc0..505f9dc0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/byref-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-right.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/byref-right.cfg
index 82fb7287..82fb7287 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/byref-right.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/byref-right.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cast.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/cast.cfg
index feac5350..feac5350 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cast.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/cast.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-colon-pos-eol-add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/class-colon-pos-eol-add.cfg
index 64c29340..64c29340 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-colon-pos-eol-add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/class-colon-pos-eol-add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-colon-pos-eol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/class-colon-pos-eol.cfg
index cf80d3f9..cf80d3f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-colon-pos-eol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/class-colon-pos-eol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-colon-pos-sol-add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/class-colon-pos-sol-add.cfg
index dc967004..dc967004 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-colon-pos-sol-add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/class-colon-pos-sol-add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-colon-pos-sol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/class-colon-pos-sol.cfg
index bae3b53b..bae3b53b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-colon-pos-sol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/class-colon-pos-sol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-nl_func-add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/class-nl_func-add.cfg
index d60ffa9b..d60ffa9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-nl_func-add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/class-nl_func-add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-nl_func-add2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/class-nl_func-add2.cfg
index f8a35e0d..148e33a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-nl_func-add2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/class-nl_func-add2.cfg
@@ -13,6 +13,6 @@ nl_class_colon                  = add
 nl_constr_colon                 = remove
 eat_blanks_after_open_brace     = true
 pos_class_comma                 = trail
-align_nl_cont                   = true
+align_nl_cont                   = 1
 align_pp_define_gap             = 4
-align_pp_define_span            = 3
\ No newline at end of file
+align_pp_define_span            = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-nl_func-del.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/class-nl_func-del.cfg
index b90f2f75..b90f2f75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-nl_func-del.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/class-nl_func-del.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-on-colon-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/class-on-colon-indent.cfg
index e21fbc7d..e21fbc7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/class-on-colon-indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/class-on-colon-indent.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_convert_tab_to_spaces-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/cmt_convert_tab_to_spaces-t.cfg
index 98b3bcf3..98b3bcf3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_convert_tab_to_spaces-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/cmt_convert_tab_to_spaces-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_cpp_to_c-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/cmt_cpp_to_c-t.cfg
index 85c3fec8..85c3fec8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_cpp_to_c-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/cmt_cpp_to_c-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_indent-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/cmt_indent-1.cfg
index 8d0a8a16..8d0a8a16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_indent-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/cmt_indent-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_indent-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/cmt_indent-2.cfg
index fd9b9d25..fd9b9d25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_indent-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/cmt_indent-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_indent-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/cmt_indent-3.cfg
index c8e6ce41..c8e6ce41 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_indent-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/cmt_indent-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_multi_first_len_minimum-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/cmt_multi_first_len_minimum-1.cfg
index e7d99a98..e7d99a98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_multi_first_len_minimum-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/cmt_multi_first_len_minimum-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_trailing_single_line_c_to_cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/cmt_trailing_single_line_c_to_cpp.cfg
index 0754b419..0754b419 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cmt_trailing_single_line_c_to_cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/cmt_trailing_single_line_c_to_cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/code_width-70.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/code_width-70.cfg
index 07c25e5c..07c25e5c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/code_width-70.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/code_width-70.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/comma-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/comma-f.cfg
index 29eb50b5..29eb50b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/comma-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/comma-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/comma-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/comma-i.cfg
index 2dad1026..2dad1026 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/comma-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/comma-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/comma-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/comma-r.cfg
index 5194e6da..5194e6da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/comma-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/comma-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/const_throw.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/const_throw.cfg
index 41b3ecef..41b3ecef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/const_throw.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/const_throw.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/constr_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/constr_colon.cfg
index 3397573a..3397573a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/constr_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/constr_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cpp17.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/cpp17.cfg
index 1865e0c8..1865e0c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cpp17.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/cpp17.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cu.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/cu.cfg
index 40dff3e5..40dff3e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/cu.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/cu.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/custom-open.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/custom-open.cfg
index 5b4539e2..5b4539e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/custom-open.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/custom-open.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/custom-open2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/custom-open2.cfg
index 38e507b5..38e507b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/custom-open2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/custom-open2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/disable_nl_cont.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/disable_nl_cont.cfg
index f80605fd..f80605fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/disable_nl_cont.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/disable_nl_cont.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/dont-detab-strings.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/dont-detab-strings.cfg
index 9e36729d..9e36729d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/dont-detab-strings.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/dont-detab-strings.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/dont-process-defines.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/dont-process-defines.cfg
index 051f834f..051f834f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/dont-process-defines.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/dont-process-defines.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/eat_blanks_after_codewidth.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/eat_blanks_after_codewidth.cfg
index 1b24a7ac..1b24a7ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/eat_blanks_after_codewidth.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/eat_blanks_after_codewidth.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ellipsis-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ellipsis-i.cfg
index 3b4d8ec6..3b4d8ec6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ellipsis-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ellipsis-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/enum.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/enum.cfg
index b39c0840..b39c0840 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/enum.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/enum.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/enum_comma-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/enum_comma-3.cfg
index 7fe548e2..7fe548e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/enum_comma-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/enum_comma-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/enum_comma-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/enum_comma-4.cfg
index d42e6b1e..d42e6b1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/enum_comma-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/enum_comma-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/enum_comma-6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/enum_comma-6.cfg
index 6d4279ec..6d4279ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/enum_comma-6.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/enum_comma-6.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/enum_comment_wrap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/enum_comment_wrap.cfg
index e42e00a1..e42e00a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/enum_comment_wrap.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/enum_comment_wrap.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/extern_func.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/extern_func.cfg
index a6135e8a..a6135e8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/extern_func.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/extern_func.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/footer.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/footer.txt
index 1d2f941f..1d2f941f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/footer.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/footer.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/func_class.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/func_class.cfg
index 7f01b7be..7f01b7be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/func_class.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/func_class.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/func_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/func_param.cfg
index 9162fd6d..9162fd6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/func_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/func_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/functype_param-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/functype_param-f.cfg
index a870e0c5..a870e0c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/functype_param-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/functype_param-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/functype_param-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/functype_param-r.cfg
index 9b70479a..9b70479a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/functype_param-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/functype_param-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/i1516.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/i1516.cfg
index 9d8433d8..9d8433d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/i1516.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/i1516.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/i1536.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/i1536.cfg
index 5506f68c..5506f68c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/i1536.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/i1536.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/i1536.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/i1536.txt
index d34c497d..d34c497d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/i1536.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/i1536.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/i1768.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/i1768.cfg
index 9174483a..9174483a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/i1768.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/i1768.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/i683.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/i683.cfg
index 2b6edefe..2b6edefe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/i683.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/i683.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/if_chain_braces_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/if_chain_braces_2.cfg
index 6547c095..792ea1a0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/if_chain_braces_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/if_chain_braces_2.cfg
@@ -1,2 +1,3 @@
+sp_sparen_brace                 = add
 mod_full_brace_if_chain         = 1
 mod_full_brace_if_chain_only    = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_braces_no.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_braces_no.cfg
index 24ca060b..24ca060b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_braces_no.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_braces_no.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_class-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_class-t.cfg
index 78320e8a..78320e8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_class-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_class-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_class-t_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_class-t_columns-4.cfg
index 5184fc9a..5184fc9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_class-t_columns-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_class-t_columns-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_columns-11.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_columns-11.cfg
index 15cef67e..15cef67e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_columns-11.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_columns-11.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_columns-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_columns-2.cfg
index f33cb665..f33cb665 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_columns-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_columns-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_columns-4.cfg
index f4f5183a..f4f5183a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_columns-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_columns-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_comma_brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_comma_brace.cfg
index 19c3b161..19c3b161 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_comma_brace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_comma_brace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_comment_align_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_comment_align_thresh_2.cfg
index 2f5d5cab..2f5d5cab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_comment_align_thresh_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_comment_align_thresh_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ctor_init.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_ctor_init.cfg
index cb1cef12..cb1cef12 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ctor_init.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_ctor_init.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ctor_init_following.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_ctor_init_following.cfg
index 140e8f17..140e8f17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ctor_init_following.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_ctor_init_following.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ctor_init_leading.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_ctor_init_leading.cfg
index ce8fb22f..ce8fb22f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ctor_init_leading.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_ctor_init_leading.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ctor_members_twice.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_ctor_members_twice.cfg
index 82c708d4..82c708d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ctor_members_twice.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_ctor_members_twice.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_else_if-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_else_if-t.cfg
index 2dcd9a57..2dcd9a57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_else_if-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_else_if-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_first_for_expr-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_first_for_expr-t.cfg
index ff68e85c..ff68e85c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_first_for_expr-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_first_for_expr-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_func_proto_param-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_func_proto_param-t.cfg
index 04301ff7..04301ff7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_func_proto_param-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_func_proto_param-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ignore_before_class_colon-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_ignore_before_class_colon-t.cfg
index 6564f4d0..6564f4d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ignore_before_class_colon-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_ignore_before_class_colon-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ignore_before_constr_colon-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_ignore_before_constr_colon-t.cfg
index 6e9fa193..6e9fa193 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_ignore_before_constr_colon-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_ignore_before_constr_colon-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_namespace-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_namespace-t.cfg
index 90bbdaec..90bbdaec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_namespace-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_namespace-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_namespace_inner_only.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_namespace_inner_only.cfg
index bb715758..bb715758 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_namespace_inner_only.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_namespace_inner_only.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_namespace_single_indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_namespace_single_indent.cfg
index 9f66fea4..9f66fea4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_namespace_single_indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_namespace_single_indent.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_off_after_return.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_off_after_return.cfg
index 077c5f94..077c5f94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_off_after_return.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_off_after_return.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_once.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_once.cfg
index 013985b9..013985b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_once.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_once.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_param.cfg
index 07d98897..07d98897 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_after_func_call-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_paren_after_func_call-t.cfg
index eafffebc..eafffebc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_after_func_call-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_paren_after_func_call-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_after_func_decl-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_paren_after_func_decl-t.cfg
index c4db2ffe..c4db2ffe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_after_func_decl-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_paren_after_func_decl-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_after_func_def-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_paren_after_func_def-t.cfg
index 5d2895e9..5d2895e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_after_func_def-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_paren_after_func_def-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_close_0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_paren_close_0.cfg
index b14f0bc5..b14f0bc5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_close_0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_paren_close_0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_close_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_paren_close_1.cfg
index 06795707..06795707 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_close_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_paren_close_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_close_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_paren_close_2.cfg
index b78b2995..b78b2995 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_paren_close_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_paren_close_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_semicolon_for_paren-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_semicolon_for_paren-t.cfg
index 6b49dbd6..6b49dbd6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_semicolon_for_paren-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_semicolon_for_paren-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_shift.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_shift.cfg
index 481d7d07..481d7d07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_shift.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_shift.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_var_def_cont-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_var_def_cont-t.cfg
index f439a00b..f439a00b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_var_def_cont-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_var_def_cont-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_with_tabs-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_with_tabs-0.cfg
index bd2c3a08..bd2c3a08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/indent_with_tabs-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/indent_with_tabs-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/initlist_leading_commas.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/initlist_leading_commas.cfg
index ebd35547..ebd35547 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/initlist_leading_commas.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/initlist_leading_commas.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/interface-keyword-in-cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/interface-keyword-in-cpp.cfg
index cbbf215b..cbbf215b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/interface-keyword-in-cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/interface-keyword-in-cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1778.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_1778.cfg
index 2f4bd642..2f4bd642 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1778.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_1778.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1782.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_1782.cfg
index 6d50bfeb..6d50bfeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1782.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_1782.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1804.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_1804.cfg
index 4c424b89..4c424b89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1804.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_1804.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1887.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_1887.cfg
index 956ea6a9..956ea6a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1887.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_1887.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1916.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_1916.cfg
index 414a4a96..414a4a96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1916.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_1916.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1985.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_1985.cfg
index 3be58c29..3be58c29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1985.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_1985.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1997.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_1997.cfg
index 1f79d36e..1f79d36e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_1997.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_1997.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2124-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_2124-1.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2124-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_2124-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2124-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_2124-2.cfg
index 37eeb5f2..37eeb5f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2124-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_2124-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2209.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_2209.cfg
index 414a7273..414a7273 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2209.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_2209.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2623_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_2623_1.cfg
index 56ab3a56..56ab3a56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2623_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_2623_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2623_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_2623_2.cfg
index 2848fb59..2848fb59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2623_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_2623_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2623_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_2623_3.cfg
index 52d17555..52d17555 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_2623_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_2623_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3105_1_neg.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3105_1_neg.cfg
new file mode 100644
index 00000000..790403a8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3105_1_neg.cfg
@@ -0,0 +1,7 @@
+code_width       = 60
+indent_with_tabs = 1
+indent_columns   = 2
+indent_continue  = -7
+input_tab_size   = 2
+output_tab_size  = 2
+sp_assign        = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3105_1_pos.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3105_1_pos.cfg
new file mode 100644
index 00000000..02fa0c38
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3105_1_pos.cfg
@@ -0,0 +1,7 @@
+code_width       = 60
+indent_with_tabs = 1
+indent_columns   = 2
+indent_continue  = 5
+input_tab_size   = 2
+output_tab_size  = 2
+sp_assign        = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3105_1_zero.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3105_1_zero.cfg
new file mode 100644
index 00000000..cd22d8bb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3105_1_zero.cfg
@@ -0,0 +1,7 @@
+code_width       = 60
+indent_with_tabs = 1
+indent_columns   = 2
+indent_continue  = 0
+input_tab_size   = 2
+output_tab_size  = 2
+sp_assign        = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3105_2_neg.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3105_2_neg.cfg
new file mode 100644
index 00000000..806250c7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3105_2_neg.cfg
@@ -0,0 +1,69 @@
+newlines                        = lf
+input_tab_size                  = 2
+output_tab_size                 = 2
+sp_arith                        = force
+sp_assign                       = force
+sp_inside_paren                 = remove
+sp_paren_paren                  = remove
+sp_before_ptr_star              = force
+sp_before_ptr_star_func         = remove
+sp_before_unnamed_ptr_star      = remove
+sp_after_ptr_star               = remove
+sp_after_ptr_star_qualifier     = remove
+sp_after_ptr_star_func          = force
+sp_ptr_star_func_var            = remove
+sp_ptr_star_func_type           = remove
+sp_ptr_star_paren               = force
+sp_before_byref                 = force
+sp_before_unnamed_byref         = force
+sp_after_byref                  = remove
+sp_after_comma                  = force
+sp_before_comma                 = remove
+sp_after_constr_colon           = force
+sp_before_constr_colon          = force
+sp_type_func                    = force
+sp_type_brace_init_lst          = force
+sp_func_type_paren              = remove
+sp_func_def_paren               = remove
+sp_func_def_paren_empty         = remove
+sp_inside_fparens               = remove
+sp_inside_fparen                = remove
+sp_func_call_paren              = remove
+sp_cond_question                = force
+indent_columns                  = 2
+indent_continue                 = -8
+indent_with_tabs                = 1
+indent_align_string             = true
+indent_ignore_before_constr_colon = false
+indent_constr_colon             = true
+indent_ctor_init_leading        = 2
+indent_ctor_init_following      = 2
+indent_ctor_init                = 2
+indent_else_if                  = false
+nl_end_of_file                  = force
+nl_end_of_file_min              = 1
+nl_case_colon_brace             = force
+nl_class_brace                  = force
+nl_class_init_args              = remove
+nl_constr_init_args             = remove
+nl_enum_own_lines               = force
+nl_func_decl_start              = remove
+nl_func_def_start               = remove
+nl_func_decl_args               = remove
+nl_func_def_args                = remove
+nl_func_call_args               = remove
+nl_func_decl_end                = remove
+nl_func_def_end                 = remove
+nl_func_decl_empty              = remove
+nl_func_def_empty               = remove
+nl_func_call_empty              = remove
+nl_func_call_start              = remove
+nl_func_call_end                = remove
+nl_before_brace_open            = true
+pos_arith                       = join
+pos_assign                      = join
+pos_bool                        = trail
+pos_comma                       = trail
+pos_constr_comma                = trail
+pos_constr_colon                = trail
+code_width                      = 100
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3105_2_pos.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3105_2_pos.cfg
new file mode 100644
index 00000000..29afa7d9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3105_2_pos.cfg
@@ -0,0 +1,69 @@
+newlines                        = lf
+input_tab_size                  = 2
+output_tab_size                 = 2
+sp_arith                        = force
+sp_assign                       = force
+sp_inside_paren                 = remove
+sp_paren_paren                  = remove
+sp_before_ptr_star              = force
+sp_before_ptr_star_func         = remove
+sp_before_unnamed_ptr_star      = remove
+sp_after_ptr_star               = remove
+sp_after_ptr_star_qualifier     = remove
+sp_after_ptr_star_func          = force
+sp_ptr_star_func_var            = remove
+sp_ptr_star_func_type           = remove
+sp_ptr_star_paren               = force
+sp_before_byref                 = force
+sp_before_unnamed_byref         = force
+sp_after_byref                  = remove
+sp_after_comma                  = force
+sp_before_comma                 = remove
+sp_after_constr_colon           = force
+sp_before_constr_colon          = force
+sp_type_func                    = force
+sp_type_brace_init_lst          = force
+sp_func_type_paren              = remove
+sp_func_def_paren               = remove
+sp_func_def_paren_empty         = remove
+sp_inside_fparens               = remove
+sp_inside_fparen                = remove
+sp_func_call_paren              = remove
+sp_cond_question                = force
+indent_columns                  = 2
+indent_continue                 = 4
+indent_with_tabs                = 1
+indent_align_string             = true
+indent_ignore_before_constr_colon = false
+indent_constr_colon             = true
+indent_ctor_init_leading        = 2
+indent_ctor_init_following      = 2
+indent_ctor_init                = 2
+indent_else_if                  = false
+nl_end_of_file                  = force
+nl_end_of_file_min              = 1
+nl_case_colon_brace             = force
+nl_class_brace                  = force
+nl_class_init_args              = remove
+nl_constr_init_args             = remove
+nl_enum_own_lines               = force
+nl_func_decl_start              = remove
+nl_func_def_start               = remove
+nl_func_decl_args               = remove
+nl_func_def_args                = remove
+nl_func_call_args               = remove
+nl_func_decl_end                = remove
+nl_func_def_end                 = remove
+nl_func_decl_empty              = remove
+nl_func_def_empty               = remove
+nl_func_call_empty              = remove
+nl_func_call_start              = remove
+nl_func_call_end                = remove
+nl_before_brace_open            = true
+pos_arith                       = join
+pos_assign                      = join
+pos_bool                        = trail
+pos_comma                       = trail
+pos_constr_comma                = trail
+pos_constr_colon                = trail
+code_width                      = 100
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3105_2_zero.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3105_2_zero.cfg
new file mode 100644
index 00000000..25453288
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3105_2_zero.cfg
@@ -0,0 +1,69 @@
+newlines                        = lf
+input_tab_size                  = 2
+output_tab_size                 = 2
+sp_arith                        = force
+sp_assign                       = force
+sp_inside_paren                 = remove
+sp_paren_paren                  = remove
+sp_before_ptr_star              = force
+sp_before_ptr_star_func         = remove
+sp_before_unnamed_ptr_star      = remove
+sp_after_ptr_star               = remove
+sp_after_ptr_star_qualifier     = remove
+sp_after_ptr_star_func          = force
+sp_ptr_star_func_var            = remove
+sp_ptr_star_func_type           = remove
+sp_ptr_star_paren               = force
+sp_before_byref                 = force
+sp_before_unnamed_byref         = force
+sp_after_byref                  = remove
+sp_after_comma                  = force
+sp_before_comma                 = remove
+sp_after_constr_colon           = force
+sp_before_constr_colon          = force
+sp_type_func                    = force
+sp_type_brace_init_lst          = force
+sp_func_type_paren              = remove
+sp_func_def_paren               = remove
+sp_func_def_paren_empty         = remove
+sp_inside_fparens               = remove
+sp_inside_fparen                = remove
+sp_func_call_paren              = remove
+sp_cond_question                = force
+indent_columns                  = 2
+indent_continue                 = 0
+indent_with_tabs                = 1
+indent_align_string             = true
+indent_ignore_before_constr_colon = false
+indent_constr_colon             = true
+indent_ctor_init_leading        = 2
+indent_ctor_init_following      = 2
+indent_ctor_init                = 2
+indent_else_if                  = false
+nl_end_of_file                  = force
+nl_end_of_file_min              = 1
+nl_case_colon_brace             = force
+nl_class_brace                  = force
+nl_class_init_args              = remove
+nl_constr_init_args             = remove
+nl_enum_own_lines               = force
+nl_func_decl_start              = remove
+nl_func_def_start               = remove
+nl_func_decl_args               = remove
+nl_func_def_args                = remove
+nl_func_call_args               = remove
+nl_func_decl_end                = remove
+nl_func_def_end                 = remove
+nl_func_decl_empty              = remove
+nl_func_def_empty               = remove
+nl_func_call_empty              = remove
+nl_func_call_start              = remove
+nl_func_call_end                = remove
+nl_before_brace_open            = true
+pos_arith                       = join
+pos_assign                      = join
+pos_bool                        = trail
+pos_comma                       = trail
+pos_constr_comma                = trail
+pos_constr_colon                = trail
+code_width                      = 100
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_3116-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3116-2.cfg
index f26ef61e..f26ef61e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_3116-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3116-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_3116.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3116.cfg
index 034f2697..034f2697 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_3116.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3116.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_3378.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3378.cfg
index 8ecc9f2f..8ecc9f2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_3378.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_3378.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_564.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_564.cfg
index d1496108..d1496108 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_564.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_564.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_574-i-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_574-i-a.cfg
index 24a1a182..24a1a182 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_574-i-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_574-i-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_574-i-b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_574-i-b.cfg
index b61ac3e2..b61ac3e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_574-i-b.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_574-i-b.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_574-i-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_574-i-i.cfg
index c0177cb1..c0177cb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_574-i-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_574-i-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_574.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_574.cfg
index 925ee5fe..925ee5fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/issue_574.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/issue_574.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/kdepim2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/kdepim2.cfg
index 18b12bbe..18b12bbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/kdepim2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/kdepim2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/kdepim3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/kdepim3.cfg
index 0fe42133..0fe42133 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/kdepim3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/kdepim3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/kdepim5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/kdepim5.cfg
index 56a1b3da..56a1b3da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/kdepim5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/kdepim5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lambda1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/lambda1.cfg
index c0fbc795..c0fbc795 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lambda1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/lambda1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lambda2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/lambda2.cfg
index 9f698209..9f698209 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lambda2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/lambda2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lambda3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/lambda3.cfg
index ffed35eb..ffed35eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lambda3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/lambda3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lambda4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/lambda4.cfg
index 63a99010..63a99010 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lambda4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/lambda4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lambda_in_one_liner.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/lambda_in_one_liner.cfg
index 7b61e767..7b61e767 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lambda_in_one_liner.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/lambda_in_one_liner.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lineEndings-to-Mac.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/lineEndings-to-Mac.cfg
index d8b41944..d8b41944 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lineEndings-to-Mac.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/lineEndings-to-Mac.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lineEndings-to-Unix.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/lineEndings-to-Unix.cfg
index e6cf9411..e6cf9411 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lineEndings-to-Unix.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/lineEndings-to-Unix.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lineEndings-to-Win.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/lineEndings-to-Win.cfg
index cb40d365..cb40d365 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/lineEndings-to-Win.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/lineEndings-to-Win.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/long_br_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/long_br_cmt.cfg
index f66ee7c7..f66ee7c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/long_br_cmt.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/long_br_cmt.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/long_namespace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/long_namespace.cfg
index 74f99a18..74f99a18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/long_namespace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/long_namespace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_add_long_class_closebrace_comment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_add_long_class_closebrace_comment.cfg
index a3752ab8..a3752ab8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_add_long_class_closebrace_comment.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_add_long_class_closebrace_comment.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_add_long_namespace_closebrace_comment-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_add_long_namespace_closebrace_comment-1.cfg
index a94f5a62..a94f5a62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_add_long_namespace_closebrace_comment-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_add_long_namespace_closebrace_comment-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_full_brace_if_chain-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_full_brace_if_chain-1.cfg
new file mode 100644
index 00000000..678bce2d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_full_brace_if_chain-1.cfg
@@ -0,0 +1,2 @@
+sp_sparen_brace                 = add
+mod_full_brace_if_chain         = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_full_brace_if_chain-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_full_brace_if_chain-2.cfg
new file mode 100644
index 00000000..6c0fec7c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_full_brace_if_chain-2.cfg
@@ -0,0 +1,2 @@
+sp_sparen_brace                 = add
+mod_full_brace_if_chain         = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_full_brace_if_chain-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_full_brace_if_chain-3.cfg
new file mode 100644
index 00000000..90ab2ba5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_full_brace_if_chain-3.cfg
@@ -0,0 +1,2 @@
+sp_sparen_brace                 = add
+mod_full_brace_if_chain         = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_paren_on_throw-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_paren_on_throw-a.cfg
index ca119beb..ca119beb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_paren_on_throw-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_paren_on_throw-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_paren_on_throw-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_paren_on_throw-f.cfg
index b442438e..b442438e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_paren_on_throw-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_paren_on_throw-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_paren_on_throw-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_paren_on_throw-i.cfg
index 517dfce3..517dfce3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_paren_on_throw-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_paren_on_throw-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_paren_on_throw-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_paren_on_throw-r.cfg
index 498b6b01..498b6b01 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_paren_on_throw-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_paren_on_throw-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_remove_empty_return-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_remove_empty_return-t.cfg
index 3e1bcd1f..3e1bcd1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_remove_empty_return-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_remove_empty_return-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_remove_extra_semicolon-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_remove_extra_semicolon-t.cfg
index 0f2d5246..0f2d5246 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/mod_remove_extra_semicolon-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/mod_remove_extra_semicolon-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/multi_line_1.cfg
index fe15ff0a..fe15ff0a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/multi_line_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_10.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/multi_line_10.cfg
index e5b917e8..e5b917e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_10.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/multi_line_10.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/multi_line_2.cfg
index b4063fd3..b4063fd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/multi_line_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/multi_line_3.cfg
index d1c40d07..d1c40d07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/multi_line_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/multi_line_4.cfg
index 651b4823..651b4823 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/multi_line_4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/multi_line_5.cfg
index 94140b21..94140b21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/multi_line_5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/multi_line_6.cfg
index 4fd7a077..4fd7a077 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_6.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/multi_line_6.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_7.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/multi_line_7.cfg
index 4ee5733c..4ee5733c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_7.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/multi_line_7.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/multi_line_8.cfg
index 5d6d9c63..5d6d9c63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_8.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/multi_line_8.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_9.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/multi_line_9.cfg
index be9a43e3..be9a43e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/multi_line_9.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/multi_line_9.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nSolve.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nSolve.cfg
index 6cc6fc27..6cc6fc27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nSolve.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nSolve.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/negative_indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/negative_indent.cfg
index 39b1b007..39b1b007 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/negative_indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/negative_indent.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/new_op_a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/new_op_a.cfg
index d7501092..d7501092 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/new_op_a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/new_op_a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/new_op_f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/new_op_f.cfg
index 16784899..16784899 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/new_op_f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/new_op_f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/new_op_paren_open_close.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/new_op_paren_open_close.cfg
index 789c7abe..789c7abe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/new_op_paren_open_close.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/new_op_paren_open_close.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/new_op_r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/new_op_r.cfg
index b72cd2ae..b72cd2ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/new_op_r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/new_op_r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl-brAfter-fcallParen.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl-brAfter-fcallParen.cfg
index 6a83f800..6a83f800 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl-brAfter-fcallParen.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl-brAfter-fcallParen.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_access_spec.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_access_spec.cfg
index a5d98c44..a5d98c44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_access_spec.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_access_spec.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_after_func_body-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_after_func_body-2.cfg
index 9c9e7d57..6eb57487 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_after_func_body-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_after_func_body-2.cfg
@@ -3,5 +3,6 @@ indent_class                    = true
 nl_class_leave_one_liners       = true
 nl_fdef_brace                   = remove
 nl_after_func_body              = 4
+nl_min_after_func_body          = 6
 nl_after_func_body_one_liner    = 2
-eat_blanks_before_close_brace   = true
\ No newline at end of file
+eat_blanks_before_close_brace   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_after_func_body.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_after_func_body.cfg
index 68633b6d..2da46cf7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_after_func_body.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_after_func_body.cfg
@@ -2,4 +2,5 @@ sp_fparen_brace                 = force
 indent_class                    = true
 nl_fdef_brace                   = remove
 nl_after_func_body              = 4
-eat_blanks_before_close_brace   = true
\ No newline at end of file
+nl_min_after_func_body          = 3
+eat_blanks_before_close_brace   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_after_func_class_proto-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_after_func_class_proto-3.cfg
index 87b84e91..87b84e91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_after_func_class_proto-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_after_func_class_proto-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_after_func_proto-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_after_func_proto-3.cfg
index c9bc1f45..c9bc1f45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_after_func_proto-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_after_func_proto-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_after_func_proto_group-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_after_func_proto_group-3.cfg
index 63fa256a..63fa256a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_after_func_proto_group-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_after_func_proto_group-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_assign_leave_one_liners.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_assign_leave_one_liners.cfg
index 6914813b..6914813b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_assign_leave_one_liners.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_assign_leave_one_liners.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_brace_open_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_before_brace_open_1.cfg
index 4146c6fb..4146c6fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_brace_open_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_before_brace_open_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_brace_open_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_before_brace_open_2.cfg
index bc1aaf83..bc1aaf83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_brace_open_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_before_brace_open_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_brace_open_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_before_brace_open_3.cfg
index 02daa843..02daa843 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_brace_open_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_before_brace_open_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_func_body_def-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_before_func_body_def-1.cfg
index 03ee374a..03ee374a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_func_body_def-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_before_func_body_def-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_func_body_def-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_before_func_body_def-2.cfg
index 2f3ba945..2f3ba945 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_func_body_def-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_before_func_body_def-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_if_closing_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_before_if_closing_paren-f.cfg
index 39539a4e..39539a4e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_if_closing_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_before_if_closing_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_if_closing_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_before_if_closing_paren-r.cfg
index d3ab2d68..d3ab2d68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_if_closing_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_before_if_closing_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_struct.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_before_struct.cfg
index ab325b19..ab325b19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_before_struct.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_before_struct.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_brace_brace-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_brace_brace-a.cfg
index 25d3c271..25d3c271 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_brace_brace-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_brace_brace-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_brace_fparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_brace_fparen-f.cfg
index 0a731344..0a731344 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_brace_fparen-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_brace_fparen-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_brace_fparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_brace_fparen-r.cfg
index 5a749682..5a749682 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_brace_fparen-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_brace_fparen-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_class-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_class-a.cfg
index 8c1eb70e..8c1eb70e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_class-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_class-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_class-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_class-r.cfg
index 29cc4dc6..29cc4dc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_class-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_class-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_fdef_brace-r__nl_collapse_empty_body-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_fdef_brace-r__nl_collapse_empty_body-t.cfg
index 26ee0c73..26ee0c73 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_fdef_brace-r__nl_collapse_empty_body-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_fdef_brace-r__nl_collapse_empty_body-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_fdef_brace_cond-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_fdef_brace_cond-f.cfg
index 7f08f9e3..7f08f9e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_fdef_brace_cond-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_fdef_brace_cond-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_fdef_brace_cond-fr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_fdef_brace_cond-fr.cfg
index affe7156..affe7156 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_fdef_brace_cond-fr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_fdef_brace_cond-fr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_fdef_brace_cond-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_fdef_brace_cond-r.cfg
index e64f7f0c..e64f7f0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_fdef_brace_cond-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_fdef_brace_cond-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_fdef_brace_cond-rf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_fdef_brace_cond-rf.cfg
index 9b12913e..9b12913e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_fdef_brace_cond-rf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_fdef_brace_cond-rf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_for_leave_one_liners-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_for_leave_one_liners-f.cfg
index bdcceefd..bdcceefd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_for_leave_one_liners-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_for_leave_one_liners-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_for_leave_one_liners-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_for_leave_one_liners-t.cfg
index 4d11891e..4d11891e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_for_leave_one_liners-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_for_leave_one_liners-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_call_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_call_empty-r.cfg
index da04d6fa..da04d6fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_call_empty-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_call_empty-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_call_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_call_paren-f.cfg
index 480ce89f..480ce89f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_call_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_call_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_call_paren_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_call_paren_empty-r.cfg
index 48612eb5..48612eb5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_call_paren_empty-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_call_paren_empty-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_class_scope-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_class_scope-a.cfg
index dc9b2ec5..dc9b2ec5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_class_scope-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_class_scope-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_decl_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_decl_1.cfg
index 6a7f8d9b..6a7f8d9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_decl_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_decl_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_decl_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_decl_2.cfg
index c0495a4b..c0495a4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_decl_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_decl_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_def_paren_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_def_paren_empty-r.cfg
index ddc5e5d2..ddc5e5d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_def_paren_empty-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_def_paren_empty-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_paren_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_paren_empty.cfg
index 63f0b8ad..63f0b8ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_paren_empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_paren_empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_scope_name-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_scope_name-a.cfg
index c814477d..c814477d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_scope_name-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_scope_name-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_type_name-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_type_name-r.cfg
index 9cc10873..9cc10873 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_type_name-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_type_name-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_type_name_class.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_type_name_class.cfg
index fcb08501..fcb08501 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_type_name_class.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_type_name_class.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_type_name_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_type_name_force.cfg
index ef8b317e..ef8b317e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_type_name_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_type_name_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_type_name_mixed.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_type_name_mixed.cfg
index 515400f2..515400f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_type_name_mixed.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_type_name_mixed.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_type_name_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_type_name_remove.cfg
index ee38dd7e..ee38dd7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_func_type_name_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_func_type_name_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_inside_namespace_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_inside_namespace_1.cfg
index c84309ca..c84309ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_inside_namespace_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_inside_namespace_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_inside_namespace_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_inside_namespace_2.cfg
index 9edefd02..9edefd02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_inside_namespace_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_inside_namespace_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_max_after_func_body.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_max_after_func_body.cfg
new file mode 100644
index 00000000..2926bc32
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_max_after_func_body.cfg
@@ -0,0 +1,5 @@
+sp_fparen_brace                 = force
+indent_class                    = true
+nl_fdef_brace                   = remove
+nl_max_after_func_body          = 3
+eat_blanks_before_close_brace   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_max_blank_in_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_max_blank_in_func-1.cfg
index 9aa3416c..9aa3416c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_max_blank_in_func-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_max_blank_in_func-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_max_blank_in_func-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_max_blank_in_func-4.cfg
index 8d0bdf67..8d0bdf67 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_max_blank_in_func-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_max_blank_in_func-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_min_after_func_body.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_min_after_func_body.cfg
new file mode 100644
index 00000000..93ff0359
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_min_after_func_body.cfg
@@ -0,0 +1,5 @@
+sp_fparen_brace                 = force
+indent_class                    = true
+nl_fdef_brace                   = remove
+nl_min_after_func_body          = 3
+eat_blanks_before_close_brace   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_namespace-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_namespace-a.cfg
index bc5d6469..bc5d6469 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_namespace-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_namespace-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_namespace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_namespace-r.cfg
index ca9c198d..ca9c198d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_namespace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_namespace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_remove_extra_newlines-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_remove_extra_newlines-1.cfg
index 2d0c48b2..2d0c48b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_remove_extra_newlines-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_remove_extra_newlines-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_template-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_template-f.cfg
index a90d1500..a90d1500 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_template-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_template-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_template-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_template-r.cfg
index 443693e5..443693e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_template-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_template-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_throw_expr-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_throw_expr-a.cfg
index 0a8e4192..0a8e4192 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_throw_expr-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_throw_expr-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_throw_expr-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_throw_expr-f.cfg
index 406bd3ae..406bd3ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_throw_expr-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_throw_expr-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_throw_expr-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_throw_expr-i.cfg
index 608f3065..608f3065 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_throw_expr-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_throw_expr-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_throw_expr-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_throw_expr-r.cfg
index 80267701..80267701 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_throw_expr-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_throw_expr-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_try-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_try-a.cfg
index b85fcb08..b85fcb08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_try-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_try-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_type_brace_init_lst-f.cfg
index 1b29c5cd..1b29c5cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_type_brace_init_lst-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_type_brace_init_lst-r.cfg
index ef8d1de1..ef8d1de1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_type_brace_init_lst-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst_close-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_type_brace_init_lst_close-f.cfg
index 4e070657..4e070657 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst_close-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_type_brace_init_lst_close-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst_close-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_type_brace_init_lst_close-r.cfg
index d4834efd..d4834efd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst_close-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_type_brace_init_lst_close-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst_open-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_type_brace_init_lst_open-f.cfg
index 1e9289e4..1e9289e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst_open-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_type_brace_init_lst_open-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst_open-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_type_brace_init_lst_open-r.cfg
index 7d493c8b..7d493c8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/nl_type_brace_init_lst_open-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/nl_type_brace_init_lst_open-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/no_squeeze_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/no_squeeze_ifdef.cfg
index af4a3020..af4a3020 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/no_squeeze_ifdef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/no_squeeze_ifdef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/op-space-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/op-space-force.cfg
index 4feac69a..4feac69a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/op-space-force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/op-space-force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/op-space-remove-align-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/op-space-remove-align-1.cfg
index 5be45718..5be45718 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/op-space-remove-align-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/op-space-remove-align-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/op-space-remove-align-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/op-space-remove-align-2.cfg
index 32b7687a..32b7687a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/op-space-remove-align-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/op-space-remove-align-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/op-space-remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/op-space-remove.cfg
index 5424ede9..5424ede9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/op-space-remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/op-space-remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/op_sym_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/op_sym_empty.cfg
index d9a57ce1..d9a57ce1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/op_sym_empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/op_sym_empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/out-668-F.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/out-668-F.cfg
index 77d9e08c..77d9e08c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/out-668-F.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/out-668-F.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/out-668-T.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/out-668-T.cfg
index a48c3ebb..a48c3ebb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/out-668-T.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/out-668-T.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_assign.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/pos_assign.cfg
index 3b9c3700..3b9c3700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_assign.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/pos_assign.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_comma-lf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/pos_comma-lf.cfg
index 9f2daab6..9f2daab6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_comma-lf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/pos_comma-lf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_comma-tb.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/pos_comma-tb.cfg
index 3530982a..3530982a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_comma-tb.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/pos_comma-tb.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_enum_comma-tf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/pos_enum_comma-tf.cfg
index 26cf3dff..26cf3dff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_enum_comma-tf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/pos_enum_comma-tf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_shift-join.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/pos_shift-join.cfg
index 69ce2c94..69ce2c94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_shift-join.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/pos_shift-join.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_shift-lead.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/pos_shift-lead.cfg
index 08e7d5de..08e7d5de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_shift-lead.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/pos_shift-lead.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_shift-trail.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/pos_shift-trail.cfg
index a6b45298..a6b45298 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pos_shift-trail.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/pos_shift-trail.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pp-pragma.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/pp-pragma.cfg
index e143a69c..e143a69c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pp-pragma.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/pp-pragma.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pp_define_at_level-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/pp_define_at_level-1.cfg
index 75f6a6a4..75f6a6a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pp_define_at_level-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/pp_define_at_level-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pp_multi_comment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/pp_multi_comment.cfg
index 0c23b380..909e8c2c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/pp_multi_comment.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/pp_multi_comment.cfg
@@ -1,7 +1,7 @@
 sp_after_comma       = force
 indent_columns       = 3
 nl_class_colon       = force
-align_nl_cont        = true
+align_nl_cont        = 1
 align_pp_define_gap  = 4
 align_pp_define_span = 3
 indent_with_tabs     = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ptr_star-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ptr_star-1.cfg
index 34a504be..34a504be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ptr_star-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ptr_star-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ptr_star-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ptr_star-2.cfg
index 6af95864..6af95864 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ptr_star-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ptr_star-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ptr_star-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ptr_star-3.cfg
index 3a5ed163..de71e0d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/ptr_star-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/ptr_star-3.cfg
@@ -1,4 +1,5 @@
 sp_before_ptr_star          = force
+sp_before_ptr_star_func     = remove
 sp_before_unnamed_ptr_star  = remove
 sp_between_ptr_star         = remove
 sp_after_ptr_star           = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/qt-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/qt-1.cfg
index b15663f7..b15663f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/qt-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/qt-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/return_dont_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/return_dont_remove.cfg
new file mode 100644
index 00000000..303753b3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/return_dont_remove.cfg
@@ -0,0 +1 @@
+mod_remove_empty_return = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/return_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/return_remove.cfg
new file mode 100644
index 00000000..3e1bcd1f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/return_remove.cfg
@@ -0,0 +1 @@
+mod_remove_empty_return = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sef.cfg
index ee467d79..ee467d79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/semi-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/semi-f.cfg
index 0ffadc4a..0ffadc4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/semi-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/semi-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/semi-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/semi-i.cfg
index b4260607..b4260607 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/semi-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/semi-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/semi-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/semi-r.cfg
index a8465b8c..a8465b8c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/semi-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/semi-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sf.2886991-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sf.2886991-f.cfg
index 46a15bac..46a15bac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sf.2886991-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sf.2886991-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sf.2886991-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sf.2886991-r.cfg
index 8f6c0f6d..8f6c0f6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sf.2886991-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sf.2886991-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sf.3315874.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sf.3315874.cfg
index 99da8446..99da8446 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sf.3315874.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sf.3315874.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sf574.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sf574.cfg
index 8fc266f7..8fc266f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sf574.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sf574.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sim.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sim.cfg
index cb954233..cb954233 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sim.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sim.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_angle-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_angle-1.cfg
index cae5bbb7..cae5bbb7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_angle-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_angle-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_angle-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_angle-2.cfg
index c14d7901..c14d7901 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_angle-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_angle-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_angle-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_angle-3.cfg
index d0428a10..d0428a10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_angle-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_angle-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_cast-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_cast-f.cfg
index d92ffb0d..d92ffb0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_cast-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_cast-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_cast-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_cast-r.cfg
index 130602eb..130602eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_cast-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_cast-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_constr_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_constr_colon.cfg
index aa1189dd..aa1189dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_constr_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_constr_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_decltype-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_decltype-f.cfg
index 077c5f94..077c5f94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_decltype-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_decltype-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_decltype-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_decltype-r.cfg
index 64a318a0..64a318a0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_decltype-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_decltype-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_ellipsis-f.cfg
index e30e169a..e30e169a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_ellipsis-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_ellipsis-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_ptr_star_qualifier-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_ptr_star_qualifier-f.cfg
index 7e26046f..7e26046f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_ptr_star_qualifier-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_ptr_star_qualifier-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_type-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_type-i.cfg
index bd45658a..bd45658a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_type-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_type-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_type_brace_init_lst_open-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_type_brace_init_lst_open-f.cfg
index d3b744b4..d3b744b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_type_brace_init_lst_open-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_type_brace_init_lst_open-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_type_brace_init_lst_open-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_type_brace_init_lst_open-r.cfg
index f370b82e..f370b82e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_after_type_brace_init_lst_open-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_after_type_brace_init_lst_open-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_angle_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_angle_colon.cfg
index e247bbbe..e247bbbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_angle_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_angle_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_angle_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_angle_paren-f.cfg
index 0b3d2f92..0b3d2f92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_angle_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_angle_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_angle_paren_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_angle_paren_empty.cfg
index 1e3c592b..1e3c592b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_angle_paren_empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_angle_paren_empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_arith-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_arith-a.cfg
index 4d60daa9..4d60daa9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_arith-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_arith-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_arith_additive-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_arith_additive-f.cfg
index 8e6f0585..8e6f0585 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_arith_additive-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_arith_additive-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_arith_additive-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_arith_additive-r.cfg
index e01e86f7..e01e86f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_arith_additive-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_arith_additive-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_assign_default.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_assign_default.cfg
index 29411834..29411834 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_assign_default.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_assign_default.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_balance_nested_parens.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_balance_nested_parens.cfg
index 8e9dbb6f..8e9dbb6f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_balance_nested_parens.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_balance_nested_parens.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_byref_func.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_byref_func.cfg
index 6f5e2783..6f5e2783 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_byref_func.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_byref_func.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_case_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_case_colon.cfg
index d0bef793..d0bef793 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_case_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_case_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_comma-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_comma-f.cfg
index dc25e313..dc25e313 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_comma-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_comma-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_constr_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_constr_colon.cfg
index 9d0ec317..9d0ec317 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_constr_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_constr_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_ellipsis-f.cfg
index ed701425..ed701425 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_ellipsis-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_ellipsis-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_ellipsis-r.cfg
index e2163788..e2163788 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_ellipsis-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_ellipsis-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_global_scope_ptr_star-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_global_scope_ptr_star-a.cfg
new file mode 100644
index 00000000..28d19cfe
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_global_scope_ptr_star-a.cfg
@@ -0,0 +1 @@
+sp_before_global_scope_ptr_star = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_global_scope_ptr_star-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_global_scope_ptr_star-f.cfg
new file mode 100644
index 00000000..9df29273
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_global_scope_ptr_star-f.cfg
@@ -0,0 +1 @@
+sp_before_global_scope_ptr_star = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_global_scope_ptr_star-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_global_scope_ptr_star-i.cfg
new file mode 100644
index 00000000..5afb1141
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_global_scope_ptr_star-i.cfg
@@ -0,0 +1 @@
+sp_before_global_scope_ptr_star = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_global_scope_ptr_star-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_global_scope_ptr_star-r.cfg
new file mode 100644
index 00000000..eac5b355
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_global_scope_ptr_star-r.cfg
@@ -0,0 +1 @@
+sp_before_global_scope_ptr_star = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_operator_ptr_star-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_operator_ptr_star-a.cfg
new file mode 100644
index 00000000..f40f3a62
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_operator_ptr_star-a.cfg
@@ -0,0 +1 @@
+sp_before_operator_ptr_star = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_operator_ptr_star-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_operator_ptr_star-f.cfg
new file mode 100644
index 00000000..8b8e8332
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_operator_ptr_star-f.cfg
@@ -0,0 +1 @@
+sp_before_operator_ptr_star = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_operator_ptr_star-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_operator_ptr_star-i.cfg
new file mode 100644
index 00000000..50a71231
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_operator_ptr_star-i.cfg
@@ -0,0 +1 @@
+sp_before_operator_ptr_star = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_operator_ptr_star-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_operator_ptr_star-r.cfg
new file mode 100644
index 00000000..da110551
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_operator_ptr_star-r.cfg
@@ -0,0 +1 @@
+sp_before_operator_ptr_star = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_ptr_star-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_ptr_star-f.cfg
index 7653ec0b..7653ec0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_ptr_star-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_ptr_star-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_ptr_star-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_ptr_star-r.cfg
index 55f99c73..55f99c73 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_ptr_star-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_ptr_star-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_qualifier_ptr_star-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_qualifier_ptr_star-a.cfg
new file mode 100644
index 00000000..045ee52d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_qualifier_ptr_star-a.cfg
@@ -0,0 +1 @@
+sp_before_qualifier_ptr_star = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_qualifier_ptr_star-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_qualifier_ptr_star-f.cfg
new file mode 100644
index 00000000..4996ffc2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_qualifier_ptr_star-f.cfg
@@ -0,0 +1 @@
+sp_before_qualifier_ptr_star = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_qualifier_ptr_star-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_qualifier_ptr_star-i.cfg
new file mode 100644
index 00000000..ddb4d122
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_qualifier_ptr_star-i.cfg
@@ -0,0 +1 @@
+sp_before_qualifier_ptr_star = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_qualifier_ptr_star-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_qualifier_ptr_star-r.cfg
new file mode 100644
index 00000000..67899aaa
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_qualifier_ptr_star-r.cfg
@@ -0,0 +1 @@
+sp_before_qualifier_ptr_star = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_scope_ptr_star-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_scope_ptr_star-a.cfg
new file mode 100644
index 00000000..22f4e1c0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_scope_ptr_star-a.cfg
@@ -0,0 +1 @@
+sp_before_scope_ptr_star = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_scope_ptr_star-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_scope_ptr_star-f.cfg
new file mode 100644
index 00000000..e47dce8d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_scope_ptr_star-f.cfg
@@ -0,0 +1 @@
+sp_before_scope_ptr_star = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_scope_ptr_star-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_scope_ptr_star-i.cfg
new file mode 100644
index 00000000..f86b81a7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_scope_ptr_star-i.cfg
@@ -0,0 +1 @@
+sp_before_scope_ptr_star = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_scope_ptr_star-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_scope_ptr_star-r.cfg
new file mode 100644
index 00000000..7d90d59f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_scope_ptr_star-r.cfg
@@ -0,0 +1 @@
+sp_before_scope_ptr_star = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_tr_emb_cmt-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_tr_emb_cmt-a.cfg
index 834fd302..834fd302 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_tr_emb_cmt-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_tr_emb_cmt-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_tr_emb_cmt-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_tr_emb_cmt-f.cfg
index 54720c71..54720c71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_tr_emb_cmt-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_tr_emb_cmt-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_type_brace_init_lst_close-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_type_brace_init_lst_close-f.cfg
index 3dda0281..3dda0281 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_type_brace_init_lst_close-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_type_brace_init_lst_close-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_type_brace_init_lst_close-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_type_brace_init_lst_close-r.cfg
index 5fb0bf36..5fb0bf36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_before_type_brace_init_lst_close-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_before_type_brace_init_lst_close-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_between_ptr_ref-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_between_ptr_ref-a.cfg
new file mode 100644
index 00000000..9e631229
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_between_ptr_ref-a.cfg
@@ -0,0 +1,13 @@
+sp_sparen_brace                 = add
+sp_before_ptr_star              = remove
+sp_between_ptr_ref              = add
+sp_before_byref                 = remove
+sp_before_angle                 = remove
+sp_inside_angle                 = remove
+sp_angle_paren                  = remove
+sp_angle_paren_empty            = remove
+sp_angle_word                   = force
+sp_before_square                = force
+indent_columns                  = 2
+nl_if_brace                     = remove
+nl_after_func_proto_group       = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_between_ptr_ref-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_between_ptr_ref-f.cfg
new file mode 100644
index 00000000..fe49b810
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_between_ptr_ref-f.cfg
@@ -0,0 +1,13 @@
+sp_sparen_brace                 = add
+sp_before_ptr_star              = remove
+sp_between_ptr_ref              = force
+sp_before_byref                 = remove
+sp_before_angle                 = remove
+sp_inside_angle                 = remove
+sp_angle_paren                  = remove
+sp_angle_paren_empty            = remove
+sp_angle_word                   = force
+sp_before_square                = force
+indent_columns                  = 2
+nl_if_brace                     = remove
+nl_after_func_proto_group       = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_between_ptr_ref-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_between_ptr_ref-i.cfg
new file mode 100644
index 00000000..b4cf7d41
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_between_ptr_ref-i.cfg
@@ -0,0 +1,13 @@
+sp_sparen_brace                 = add
+sp_before_ptr_star              = remove
+sp_between_ptr_ref              = ignore
+sp_before_byref                 = remove
+sp_before_angle                 = remove
+sp_inside_angle                 = remove
+sp_angle_paren                  = remove
+sp_angle_paren_empty            = remove
+sp_angle_word                   = force
+sp_before_square                = force
+indent_columns                  = 2
+nl_if_brace                     = remove
+nl_after_func_proto_group       = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_between_ptr_ref-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_between_ptr_ref-r.cfg
new file mode 100644
index 00000000..aa0644cf
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_between_ptr_ref-r.cfg
@@ -0,0 +1,13 @@
+sp_sparen_brace                 = add
+sp_before_ptr_star              = remove
+sp_between_ptr_ref              = remove
+sp_before_byref                 = remove
+sp_before_angle                 = remove
+sp_inside_angle                 = remove
+sp_angle_paren                  = remove
+sp_angle_paren_empty            = remove
+sp_angle_word                   = force
+sp_before_square                = force
+indent_columns                  = 2
+nl_if_brace                     = remove
+nl_after_func_proto_group       = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_bool-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_bool-f.cfg
index b5a9e09f..b5a9e09f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_bool-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_bool-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_bool-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_bool-i.cfg
index ae79b0a8..ae79b0a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_bool-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_bool-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_bool-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_bool-r.cfg
index 3baee576..3baee576 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_bool-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_bool-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_brace_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_brace_brace-f.cfg
index 090c2858..090c2858 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_brace_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_brace_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_brace_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_brace_brace-r.cfg
index c652b3cd..c652b3cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_brace_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_brace_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_brace_catch.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_brace_catch.cfg
new file mode 100644
index 00000000..49d1490a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_brace_catch.cfg
@@ -0,0 +1,2 @@
+sp_sparen_brace = add
+sp_brace_catch  = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_byref_paren-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_byref_paren-a.cfg
index f2c79e1a..f2c79e1a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_byref_paren-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_byref_paren-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_byref_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_byref_paren-f.cfg
index 8e7a167c..8e7a167c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_byref_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_byref_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_byref_paren-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_byref_paren-i.cfg
index 1ba244a9..1ba244a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_byref_paren-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_byref_paren-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_byref_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_byref_paren-r.cfg
index fe59915e..fe59915e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_byref_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_byref_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_catch_brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_catch_brace.cfg
new file mode 100644
index 00000000..7086e77b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_catch_brace.cfg
@@ -0,0 +1,2 @@
+sp_sparen_brace = force
+sp_catch_brace = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cmt.cfg
index fb7f6ef1..fb7f6ef1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cmt.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cmt.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cmt_cpp_region-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cmt_cpp_region-f.cfg
index 1c626401..1c626401 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cmt_cpp_region-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cmt_cpp_region-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cmt_cpp_region-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cmt_cpp_region-r.cfg
index 67a0ff11..67a0ff11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cmt_cpp_region-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cmt_cpp_region-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cond_question-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cond_question-f.cfg
index dd6f0faf..dd6f0faf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cond_question-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cond_question-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cond_question-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cond_question-i.cfg
index d671d519..d671d519 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cond_question-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cond_question-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cond_question-ir.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cond_question-ir.cfg
index 4a557554..4a557554 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cond_question-ir.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cond_question-ir.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cond_question-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cond_question-r.cfg
index 0d013cf7..0d013cf7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cond_question-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cond_question-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_constr_colon-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_constr_colon-i.cfg
index c5cd823a..c5cd823a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_constr_colon-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_constr_colon-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cparen_oparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cparen_oparen-r.cfg
index f584c02d..f584c02d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cparen_oparen-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cparen_oparen-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_fparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_fparen-f.cfg
index f45270e7..f45270e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_fparen-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_fparen-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_fparen-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_fparen-i.cfg
index cda81b02..cda81b02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_fparen-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_fparen-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_fparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_fparen-r.cfg
index c64da54c..c64da54c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_fparen-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_fparen-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_paren_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_paren_brace-f.cfg
index f632d9d6..f632d9d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_paren_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_paren_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_paren_brace-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_paren_brace-i.cfg
index 9c8e2748..9c8e2748 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_paren_brace-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_paren_brace-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_paren_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_paren_brace-r.cfg
index 492af499..492af499 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_paren_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_paren_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_square_brace-f.cfg
index cc067763..cc067763 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_square_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_brace-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_square_brace-i.cfg
index a035f41e..a035f41e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_brace-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_square_brace-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_square_brace-r.cfg
index cf703b2f..cf703b2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_square_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_square_paren-f.cfg
index 55ac955d..55ac955d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_square_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_paren-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_square_paren-i.cfg
index e8525fe5..e8525fe5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_paren-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_square_paren-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_square_paren-r.cfg
index bcb937c3..bcb937c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_cpp_lambda_square_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_cpp_lambda_square_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_dc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_dc.cfg
index c9b14cc2..c9b14cc2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_dc.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_dc.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_decltype_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_decltype_paren-f.cfg
index 3636cd02..3636cd02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_decltype_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_decltype_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_decltype_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_decltype_paren-r.cfg
index b11add96..b11add96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_decltype_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_decltype_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_endif_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_endif_cmt.cfg
index 13ddf4fe..13ddf4fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_endif_cmt.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_endif_cmt.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_enum_assign-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_enum_assign-f.cfg
index 37928822..37928822 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_enum_assign-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_enum_assign-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_enum_assign-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_enum_assign-i.cfg
index c30b6525..c30b6525 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_enum_assign-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_enum_assign-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_enum_colon-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_enum_colon-i.cfg
index d154830c..d154830c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_enum_colon-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_enum_colon-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_enum_colon-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_enum_colon-r.cfg
index 87f44474..87f44474 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_enum_colon-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_enum_colon-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_enum_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_enum_colon.cfg
index 27716eca..27716eca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_enum_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_enum_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_func_call_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_func_call_empty.cfg
index 3705267a..3705267a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_func_call_empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_func_call_empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_func_call_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_func_call_paren.cfg
index c5f8927b..c5f8927b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_func_call_paren.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_func_call_paren.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_func_class_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_func_class_empty.cfg
index 33c1faba..33c1faba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_func_class_empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_func_class_empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_func_def_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_func_def_empty.cfg
index 56a18ecd..56a18ecd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_func_def_empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_func_def_empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_func_proto_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_func_proto_empty.cfg
index 2054965d..2054965d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_func_proto_empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_func_proto_empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_braces_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_braces_empty-r.cfg
index f7b1b239..f7b1b239 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_braces_empty-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_braces_empty-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_braces_enum-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_braces_enum-f.cfg
index bd854828..bd854828 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_braces_enum-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_braces_enum-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_braces_enum-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_braces_enum-i.cfg
index a56a9ecb..a56a9ecb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_braces_enum-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_braces_enum-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_braces_enum-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_braces_enum-r.cfg
index ca8a03a0..ca8a03a0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_braces_enum-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_braces_enum-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_fparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_fparen-r.cfg
index 98f867f4..98f867f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_fparen-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_fparen-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_fparens-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_fparens-f.cfg
index b56756d1..b56756d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_fparens-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_fparens-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_type_brace_init_lst-f.cfg
index 72db534b..72db534b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_type_brace_init_lst-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-iif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_type_brace_init_lst-iif.cfg
index c42436bf..c42436bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-iif.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_type_brace_init_lst-iif.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-iii.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_type_brace_init_lst-iii.cfg
index e352ee6c..e352ee6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-iii.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_type_brace_init_lst-iii.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-irf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_type_brace_init_lst-irf.cfg
index ed72df5e..ed72df5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-irf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_type_brace_init_lst-irf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_type_brace_init_lst-r.cfg
index b0881eaf..b0881eaf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_type_brace_init_lst-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-rf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_type_brace_init_lst-rf.cfg
index cafaab52..cafaab52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_inside_type_brace_init_lst-rf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_inside_type_brace_init_lst-rf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_not_not.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_not_not.cfg
index 1c0335a4..1c0335a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_not_not.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_not_not.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_paren_brace-f.cfg
index 8f9206ab..8f9206ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_paren_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_brace-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_paren_brace-i.cfg
index f3d0f22d..f3d0f22d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_brace-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_paren_brace-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_paren_brace-r.cfg
index 7e2fce85..7e2fce85 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_paren_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_paren_ellipsis-f.cfg
index 3cc88128..3cc88128 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_ellipsis-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_paren_ellipsis-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_ellipsis-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_paren_ellipsis-i.cfg
index 093de258..093de258 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_ellipsis-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_paren_ellipsis-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_paren_ellipsis-r.cfg
index 5971dfa8..5971dfa8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_ellipsis-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_paren_ellipsis-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_noexcept-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_paren_noexcept-f.cfg
index 35e76a33..35e76a33 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_noexcept-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_paren_noexcept-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_qualifier-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_paren_qualifier-f.cfg
index f91f2aee..f91f2aee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_paren_qualifier-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_paren_qualifier-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_func-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_func-a.cfg
new file mode 100644
index 00000000..6ea5e8fb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_func-a.cfg
@@ -0,0 +1 @@
+sp_qualifier_ptr_star_func = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_func-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_func-f.cfg
new file mode 100644
index 00000000..223ae97c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_func-f.cfg
@@ -0,0 +1 @@
+sp_qualifier_ptr_star_func = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_func-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_func-i.cfg
new file mode 100644
index 00000000..e0368625
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_func-i.cfg
@@ -0,0 +1 @@
+sp_qualifier_ptr_star_func = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_func-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_func-r.cfg
new file mode 100644
index 00000000..6b2e7c0f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_func-r.cfg
@@ -0,0 +1 @@
+sp_qualifier_ptr_star_func = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_trailing-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_trailing-a.cfg
new file mode 100644
index 00000000..15b0cf87
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_trailing-a.cfg
@@ -0,0 +1 @@
+sp_qualifier_ptr_star_trailing = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_trailing-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_trailing-f.cfg
new file mode 100644
index 00000000..70a6256b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_trailing-f.cfg
@@ -0,0 +1 @@
+sp_qualifier_ptr_star_trailing = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_trailing-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_trailing-i.cfg
new file mode 100644
index 00000000..51588055
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_trailing-i.cfg
@@ -0,0 +1 @@
+sp_qualifier_ptr_star_trailing = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_trailing-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_trailing-r.cfg
new file mode 100644
index 00000000..4c74d102
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_ptr_star_trailing-r.cfg
@@ -0,0 +1 @@
+sp_qualifier_ptr_star_trailing = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_unnamed_ptr_star-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_unnamed_ptr_star-a.cfg
new file mode 100644
index 00000000..5e58bed1
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_unnamed_ptr_star-a.cfg
@@ -0,0 +1 @@
+sp_qualifier_unnamed_ptr_star = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_unnamed_ptr_star-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_unnamed_ptr_star-f.cfg
new file mode 100644
index 00000000..513ab80b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_unnamed_ptr_star-f.cfg
@@ -0,0 +1 @@
+sp_qualifier_unnamed_ptr_star = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_unnamed_ptr_star-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_unnamed_ptr_star-i.cfg
new file mode 100644
index 00000000..730348ec
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_unnamed_ptr_star-i.cfg
@@ -0,0 +1 @@
+sp_qualifier_unnamed_ptr_star = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_unnamed_ptr_star-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_unnamed_ptr_star-r.cfg
new file mode 100644
index 00000000..8ca21fea
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_qualifier_unnamed_ptr_star-r.cfg
@@ -0,0 +1 @@
+sp_qualifier_unnamed_ptr_star = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_return-a.cfg
index 16e78850..16e78850 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_return-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_return-f.cfg
index b37d9b03..b37d9b03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_return-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_return-i.cfg
index 80d2d26d..80d2d26d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_return-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_return-r.cfg
index b3d64b3f..b3d64b3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_return-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_return_brace-f.cfg
index bdea1673..bdea1673 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_return_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_return_brace-r.cfg
index a2541527..a2541527 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_return_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_return_paren-f.cfg
index 11637ca1..11637ca1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_return_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_return_paren-r.cfg
index 8fbef0b8..8fbef0b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_return_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_return_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_sizeof_ellipsis-f.cfg
index 853db73a..853db73a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_sizeof_ellipsis-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_sizeof_ellipsis-i.cfg
index 48871cc9..48871cc9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_sizeof_ellipsis-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_sizeof_ellipsis-r.cfg
index 7d1c2068..7d1c2068 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_sizeof_ellipsis-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_sizeof_ellipsis_paren-f.cfg
index 46dfb49d..46dfb49d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_sizeof_ellipsis_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis_paren-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_sizeof_ellipsis_paren-i.cfg
index 2b7d0b44..2b7d0b44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis_paren-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_sizeof_ellipsis_paren-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_sizeof_ellipsis_paren-r.cfg
index 27953868..27953868 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_sizeof_ellipsis_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_sizeof_ellipsis_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_skip_vbrace_tokens.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_skip_vbrace_tokens.cfg
index d5ce739d..d5ce739d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_skip_vbrace_tokens.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_skip_vbrace_tokens.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_throw_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_throw_paren-f.cfg
index 611cd750..611cd750 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_throw_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_throw_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_throw_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_throw_paren-r.cfg
index 893c8782..893c8782 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_throw_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_throw_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_trailing_return-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_trailing_return-f.cfg
index 9e1fe074..9e1fe074 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_trailing_return-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_trailing_return-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_trailing_return-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_trailing_return-r.cfg
index b26929ba..b26929ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_trailing_return-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_trailing_return-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_trailing_return_byref_ptr-left.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_trailing_return_byref_ptr-left.cfg
index 071f30d0..071f30d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_trailing_return_byref_ptr-left.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_trailing_return_byref_ptr-left.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_trailing_return_byref_ptr-right.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_trailing_return_byref_ptr-right.cfg
index f5078788..f5078788 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_trailing_return_byref_ptr-right.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_trailing_return_byref_ptr-right.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_brace_init_lst-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_type_brace_init_lst-f.cfg
index 2f0d5258..2f0d5258 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_brace_init_lst-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_type_brace_init_lst-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_brace_init_lst-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_type_brace_init_lst-r.cfg
index 199dc1eb..199dc1eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_brace_init_lst-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_type_brace_init_lst-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_type_ellipsis-f.cfg
index 888a68b0..888a68b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_ellipsis-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_type_ellipsis-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_ellipsis-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_type_ellipsis-i.cfg
index f6cb6d0c..f6cb6d0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_ellipsis-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_type_ellipsis-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_type_ellipsis-r.cfg
index bf831e30..bf831e30 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_ellipsis-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_type_ellipsis-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_type_func-1.cfg
index 010876e0..010876e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_func-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_type_func-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_func-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_type_func-2.cfg
index de86218b..de86218b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_func-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_type_func-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_func-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_type_func-f.cfg
index e8e5f08a..e8e5f08a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_func-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_type_func-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_func-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_type_func-r.cfg
index 62324f98..62324f98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_type_func-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_type_func-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_word_brace_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_word_brace_force.cfg
index d9c53345..d9c53345 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_word_brace_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_word_brace_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_word_brace_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_word_brace_remove.cfg
index 3fd1fa26..3fd1fa26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/sp_word_brace_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/sp_word_brace_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/space_indent_class-t_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/space_indent_class-t_columns-4.cfg
index a454237c..a454237c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/space_indent_class-t_columns-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/space_indent_class-t_columns-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/squeeze_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/squeeze_ifdef.cfg
index fa3f980c..fa3f980c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/squeeze_ifdef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/squeeze_ifdef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/squeeze_ifdef_top.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/squeeze_ifdef_top.cfg
index 6b45f49a..6b45f49a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/squeeze_ifdef_top.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/squeeze_ifdef_top.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/star_pos-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/star_pos-1.cfg
index 6c9f5806..6c9f5806 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/star_pos-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/star_pos-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/star_pos-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/star_pos-2.cfg
index dc1f45fc..dc1f45fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/star_pos-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/star_pos-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/string_replace_tab_chars-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/string_replace_tab_chars-t.cfg
index 9e36729d..9e36729d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/string_replace_tab_chars-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/string_replace_tab_chars-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/tab-0-11.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/tab-0-11.cfg
index 96f745a3..96f745a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/tab-0-11.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/tab-0-11.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/template_sp-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/template_sp-force.cfg
index 852277ca..852277ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/template_sp-force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/template_sp-force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/template_sp-ignore.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/template_sp-ignore.cfg
index b5bbb248..b5bbb248 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/template_sp-ignore.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/template_sp-ignore.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/template_sp-remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/template_sp-remove.cfg
index 5e20f3b5..5e20f3b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/template_sp-remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/template_sp-remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/templates-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/templates-i.cfg
index 25622a57..25622a57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/templates-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/templates-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/templates-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/templates-r.cfg
index 7efd2a7d..7efd2a7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/templates-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/templates-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/toggle_processing_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/toggle_processing_cmt.cfg
index 08ef987e..08ef987e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/toggle_processing_cmt.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/toggle_processing_cmt.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/toggle_processing_cmt2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/toggle_processing_cmt2.cfg
index 0b9be532..0b9be532 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/toggle_processing_cmt2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/toggle_processing_cmt2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/toggle_processing_cmt3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/toggle_processing_cmt3.cfg
index d7f1f675..d7f1f675 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/toggle_processing_cmt3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/toggle_processing_cmt3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/toggle_processing_cmt4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/toggle_processing_cmt4.cfg
index ccd7bb03..ccd7bb03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/toggle_processing_cmt4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/toggle_processing_cmt4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/using-alias-in-define.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/using-alias-in-define.cfg
index 6b0b5e8f..6b0b5e8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/using-alias-in-define.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/using-alias-in-define.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/var_def_blks-1.cfg
index 14d063e4..14d063e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/var_def_blks-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/var_def_blks-2.cfg
index f2181cae..f2181cae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/var_def_blks-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/var_def_blks-3.cfg
index aa5db84e..aa5db84e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/var_def_blks-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/var_def_blks-4.cfg
index 9e4414e9..9e4414e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/var_def_blks-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/var_def_blks-5.cfg
index 374da8c9..374da8c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/var_def_blks-5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/var_def_blks-6.cfg
index 96b054a3..96b054a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-6.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/var_def_blks-6.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-7.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/var_def_blks-7.cfg
index 22bb40b2..22bb40b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_blks-7.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/var_def_blks-7.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_gap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/var_def_gap.cfg
index 3d77d117..3d77d117 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/var_def_gap.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/var_def_gap.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/wessex.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/wessex.cfg
index 77fc3303..77fc3303 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cpp/wessex.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cpp/wessex.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/615_nested_usings.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/615_nested_usings.cfg
index ae152fd4..ae152fd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/615_nested_usings.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/615_nested_usings.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/620_getset-brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/620_getset-brace.cfg
index 8e5510d0..8e5510d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/620_getset-brace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/620_getset-brace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/625_where-constraints.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/625_where-constraints.cfg
index a6fa8175..a6fa8175 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/625_where-constraints.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/625_where-constraints.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/Issue_2705.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/Issue_2705.cfg
index 0a3ecb71..0a3ecb71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/Issue_2705.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/Issue_2705.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U-J.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U-J.cfg
index 21e55d74..21e55d74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U-J.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U-J.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U01-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U01-Cs.cfg
index 03d51601..8f88d782 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U01-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U01-Cs.cfg
@@ -154,7 +154,7 @@ align_on_operator=false
 align_mix_var_proto=false
 align_single_line_func=false
 align_single_line_brace=false
-align_nl_cont=false
+align_nl_cont=0
 align_left_shift=false
 nl_collapse_empty_body=false
 nl_assign_leave_one_liners=true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U02-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U02-Cs.cfg
index c7d6aeda..c7d6aeda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U02-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U02-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U03-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U03-Cs.cfg
index 24961370..24961370 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U03-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U03-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U04-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U04-Cs.cfg
index b331f6f8..b331f6f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U04-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U04-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U06-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U06-Cs.cfg
index 03c2c765..03c2c765 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U06-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U06-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U07-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U07-Cs.cfg
index 6306e07e..e3930c92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U07-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U07-Cs.cfg
@@ -154,7 +154,7 @@ align_on_operator=false
 align_mix_var_proto=false
 align_single_line_func=false
 align_single_line_brace=false
-align_nl_cont=false
+align_nl_cont=0
 align_left_shift=false
 nl_collapse_empty_body=false
 nl_assign_leave_one_liners=true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U08-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U08-Cs.cfg
index b5f5cb08..666c8220 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U08-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U08-Cs.cfg
@@ -154,7 +154,7 @@ align_on_operator=false
 align_mix_var_proto=false
 align_single_line_func=false
 align_single_line_brace=false
-align_nl_cont=false
+align_nl_cont=0
 align_left_shift=false
 nl_collapse_empty_body=false
 nl_assign_leave_one_liners=true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U09-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U09-Cs.cfg
index d74080d2..d74080d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U09-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U09-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U10-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U10-Cs.cfg
index 42254ddb..42254ddb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U10-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U10-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U11-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U11-Cs.cfg
index 70557c46..70557c46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U11-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U11-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U13-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U13-Cs.cfg
index 75f78b42..75f78b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U13-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U13-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U15-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U15-Cs.cfg
index 5a700342..5a700342 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/U15-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/U15-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-11662.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-11662.cfg
index 24cf86a8..24cf86a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-11662.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-11662.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-11993.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-11993.cfg
index 69092def..791d2a14 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-11993.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-11993.cfg
@@ -156,7 +156,7 @@ align_on_operator=false
 align_mix_var_proto=false
 align_single_line_func=false
 align_single_line_brace=false
-align_nl_cont=false
+align_nl_cont=0
 align_left_shift=false
 nl_collapse_empty_body=false
 nl_assign_leave_one_liners=true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1288.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-1288.cfg
index 3b6cf1b4..3b6cf1b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1288.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-1288.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1338.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-1338.cfg
index 0eef21b4..0eef21b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1338.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-1338.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1343.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-1343.cfg
index f5276e1f..f5276e1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1343.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-1343.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-13955.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-13955.cfg
index d1c7c955..d1c7c955 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-13955.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-13955.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-14131.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-14131.cfg
index 7c5535ea..7c5535ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-14131.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-14131.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-18437.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-18437.cfg
index a72d6cb2..ce664b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-18437.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-18437.cfg
@@ -155,7 +155,7 @@ align_on_operator=false
 align_mix_var_proto=false
 align_single_line_func=false
 align_single_line_brace=false
-align_nl_cont=false
+align_nl_cont=0
 align_left_shift=false
 nl_collapse_empty_body=false
 nl_assign_leave_one_liners=true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-18829.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-18829.cfg
index d65f6b27..d65f6b27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-18829.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-18829.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1975.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-1975.cfg
index 80528dc6..80528dc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1975.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-1975.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1977.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-1977.cfg
index 4563bfde..4563bfde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1977.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-1977.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1978.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-1978.cfg
index 2cf794e3..2cf794e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-1978.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-1978.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-19895.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-19895.cfg
index ac4012d1..ac4012d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-19895.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-19895.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-2020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-2020.cfg
index 0d78de45..0d78de45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-2020.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-2020.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-2021.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-2021.cfg
index 827d33e0..827d33e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-2021.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-2021.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-21730.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-21730.cfg
index 5443f32f..5443f32f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-21730.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-21730.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-2684.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-2684.cfg
index c048c827..c048c827 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-2684.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-2684.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-2685.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-2685.cfg
index 3f25a1fa..3f25a1fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-2685.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-2685.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-29933.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-29933.cfg
index 2f136516..2f136516 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-29933.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-29933.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-30498_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-30498_2.cfg
index 8f635e72..8f635e72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-30498_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-30498_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-3083.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-3083.cfg
index 80528dc6..80528dc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-3083.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-3083.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-32658.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-32658.cfg
index a0b747d1..9b71b98b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-32658.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-32658.cfg
@@ -156,7 +156,7 @@ align_on_operator=false
 align_mix_var_proto=false
 align_single_line_func=false
 align_single_line_brace=false
-align_nl_cont=false
+align_nl_cont=0
 align_left_shift=false
 nl_collapse_empty_body=false
 nl_assign_leave_one_liners=true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-37241.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-37241.cfg
index f4fe568b..e989f343 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-37241.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-37241.cfg
@@ -156,7 +156,7 @@ align_on_operator=false                             # { False, True }
 align_mix_var_proto=false                           # { False, True }
 align_single_line_func=false                        # { False, True }
 align_single_line_brace=false                       # { False, True }
-align_nl_cont=false                                 # { False, True }
+align_nl_cont=0                                     # Number
 align_left_shift=false                              # { False, True }
 nl_collapse_empty_body=false                        # { False, True }
 nl_assign_leave_one_liners=true                     # { False, True }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-9917.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-9917.cfg
index f1fd0af3..f1fd0af3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/UNI-9917.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/UNI-9917.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_032.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/ben_032.cfg
index 00575c6b..00575c6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_032.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/ben_032.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_033.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/ben_033.cfg
index 3f1ffc6c..3f1ffc6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_033.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/ben_033.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_034.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/ben_034.cfg
index 0681b1b8..0681b1b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_034.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/ben_034.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_036.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/ben_036.cfg
index ed89e06a..ed89e06a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_036.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/ben_036.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_037.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/ben_037.cfg
index 97daab41..97daab41 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_037.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/ben_037.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_038.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/ben_038.cfg
index 4384cfbd..4384cfbd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_038.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/ben_038.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_043.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/ben_043.cfg
index fcbc9ddc..fcbc9ddc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_043.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/ben_043.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_044.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/ben_044.cfg
index 6815087d..6815087d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_044.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/ben_044.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_045.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/ben_045.cfg
index 9419199e..9419199e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/ben_045.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/ben_045.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/bug_1620.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/bug_1620.cfg
index a51f35fb..7ab2efdb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/bug_1620.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/bug_1620.cfg
@@ -156,7 +156,7 @@ align_on_operator=false
 align_mix_var_proto=false

 align_single_line_func=false

 align_single_line_brace=false

-align_nl_cont=false

+align_nl_cont=0

 align_left_shift=false

 nl_collapse_empty_body=false

 nl_assign_leave_one_liners=true

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/bug_1637.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/bug_1637.cfg
index 81291e9c..c812a407 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/bug_1637.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/bug_1637.cfg
@@ -156,7 +156,7 @@ align_on_operator=false
 align_mix_var_proto=false
 align_single_line_func=false
 align_single_line_brace=false
-align_nl_cont=false
+align_nl_cont=0
 align_left_shift=false
 nl_collapse_empty_body=false
 nl_assign_leave_one_liners=true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/bug_1650.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/bug_1650.cfg
index 9bcbfed5..166b3961 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/bug_1650.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/bug_1650.cfg
@@ -154,7 +154,7 @@ align_on_operator=false
 align_mix_var_proto=false

 align_single_line_func=false

 align_single_line_brace=false

-align_nl_cont=false

+align_nl_cont=0

 align_left_shift=false

 nl_collapse_empty_body=false

 nl_assign_leave_one_liners=true

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/bug_600.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/bug_600.cfg
index 5c47913d..5c47913d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/bug_600.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/bug_600.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/bug_620.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/bug_620.cfg
index 4486cd45..4486cd45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/bug_620.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/bug_620.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/comma-cs-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/comma-cs-f.cfg
index 6ea5a2af..6ea5a2af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/comma-cs-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/comma-cs-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/comma-cs-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/comma-cs-i.cfg
index f78c61b3..f78c61b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/comma-cs-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/comma-cs-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/comma-cs-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/comma-cs-r.cfg
index 626b6ff1..626b6ff1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/comma-cs-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/comma-cs-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/cs_generics.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/cs_generics.cfg
index e4320a80..e4320a80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/cs_generics.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/cs_generics.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/getset.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/getset.cfg
index 1e1ab8e9..1e1ab8e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/getset.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/getset.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/indent-multistring-coulmn1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/indent-multistring-coulmn1.cfg
index 8ce9a4ff..8ce9a4ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/indent-multistring-coulmn1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/indent-multistring-coulmn1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/indent_cs_delegate_brace-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/indent_cs_delegate_brace-t.cfg
index 9a4e6382..9a4e6382 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/indent_cs_delegate_brace-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/indent_cs_delegate_brace-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/indent_using_block-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/indent_using_block-f.cfg
index 2bfca802..2bfca802 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/indent_using_block-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/indent_using_block-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mda_space_a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/mda_space_a.cfg
index b05558b7..b05558b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mda_space_a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/mda_space_a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mda_space_c.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/mda_space_c.cfg
index 9bfcef37..9bfcef37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mda_space_c.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/mda_space_c.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/misc-failures.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/misc-failures.cfg
index 36b9e694..36b9e694 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/misc-failures.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/misc-failures.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-0.cfg
index c187d46a..c187d46a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-1.cfg
index 13ebbd4a..13ebbd4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mod_full_paren_if_bool.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/mod_full_paren_if_bool.cfg
index f75f8801..f75f8801 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mod_full_paren_if_bool.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/mod_full_paren_if_bool.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mod_sort_using-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/mod_sort_using-t.cfg
index 805fc734..805fc734 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mod_sort_using-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/mod_sort_using-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mono.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/mono.cfg
index 64783953..64783953 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/mono.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/mono.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/new-constraint-paren-space.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/new-constraint-paren-space.cfg
index f96e03b6..f96e03b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/new-constraint-paren-space.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/new-constraint-paren-space.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/sf607.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/sf607.cfg
index ac5c0069..ac5c0069 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/sf607.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/sf607.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/sort_using_categ.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/sort_using_categ.cfg
index bf7f26e6..bf7f26e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/sort_using_categ.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/sort_using_categ.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/sp_after_comma-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/sp_after_comma-a.cfg
index 3f67ae0e..3f67ae0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/sp_after_comma-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/sp_after_comma-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/sp_assign-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/sp_assign-a.cfg
index 78ee09f5..78ee09f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/sp_assign-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/sp_assign-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/sp_between_new_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/sp_between_new_paren.cfg
index 0a338bd2..0a338bd2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/sp_between_new_paren.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/sp_between_new_paren.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/squeeze-paren-close-Option.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/squeeze-paren-close-Option.cfg
index 9d4a4f70..9d4a4f70 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/squeeze-paren-close-Option.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/squeeze-paren-close-Option.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/tcf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/tcf.cfg
index dd7fa193..dd7fa193 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/tcf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/tcf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/verbatim_strings.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/verbatim_strings.cfg
index 65e1756d..65e1756d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/cs/verbatim_strings.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/cs/verbatim_strings.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/1438.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/1438.cfg
index 6973c22f..6973c22f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/1438.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/1438.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d-tst2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/d-tst2.cfg
index db15aa59..db15aa59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d-tst2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/d-tst2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d2-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/d2-i.cfg
index b2f0f87a..b2f0f87a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d2-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/d2-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d2-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/d2-r.cfg
index 888247f8..888247f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d2-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/d2-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/d2.cfg
index e3702fbe..1f70f5ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/d2.cfg
@@ -1,3 +1,4 @@
+sp_sparen_brace                 = add
 sp_arith                        = force
 sp_compare                      = force
 sp_inside_paren                 = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/d3.cfg
index 4ce7da1b..4ce7da1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/d3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d3a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/d3a.cfg
index c729c215..c729c215 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d3a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/d3a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d_sp_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/d_sp_paren.cfg
index 5b3443e6..5b3443e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/d_sp_paren.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/d_sp_paren.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/invariant.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/invariant.cfg
index a462b4d0..a462b4d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/invariant.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/invariant.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/libd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/libd.cfg
index a29c77a4..a29c77a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/libd.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/libd.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/sp_after_type-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/sp_after_type-a.cfg
index da7a3edb..da7a3edb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/d/sp_after_type-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/d/sp_after_type-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/ecma/ben_098.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/ecma/ben_098.cfg
index bade1890..bade1890 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/ecma/ben_098.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/ecma/ben_098.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/Issue_1122.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/Issue_1122.cfg
index 8a152eda..8a152eda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/Issue_1122.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/Issue_1122.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/Issue_1124-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/Issue_1124-f.cfg
index bec692b6..bec692b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/Issue_1124-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/Issue_1124-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/Issue_1124-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/Issue_1124-r.cfg
index 1c610373..1c610373 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/Issue_1124-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/Issue_1124-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/Issue_1845.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/Issue_1845.cfg
index 5d339f68..5d339f68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/Issue_1845.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/Issue_1845.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/Issue_670.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/Issue_670.cfg
index 504b1d7d..504b1d7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/Issue_670.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/Issue_670.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/annotation.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/annotation.cfg
index 0d800a82..0d800a82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/annotation.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/annotation.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/ben_099.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/ben_099.cfg
index 6cd10860..6cd10860 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/ben_099.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/ben_099.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/doxy-javadoc-alignment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/doxy-javadoc-alignment.cfg
index 786a9ac7..786a9ac7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/doxy-javadoc-alignment.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/doxy-javadoc-alignment.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/java_foreach.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/java_foreach.cfg
index 56ec94cd..56ec94cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/java_foreach.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/java_foreach.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/java_synchronized_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/java_synchronized_1.cfg
index e57bba91..e57bba91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/java_synchronized_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/java_synchronized_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/java_synchronized_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/java_synchronized_2.cfg
index 3512cdc8..3512cdc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/java_synchronized_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/java_synchronized_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/jdbi-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/jdbi-f.cfg
index fde00f38..fde00f38 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/jdbi-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/jdbi-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/jdbi-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/jdbi-r.cfg
index ed2a6942..ed2a6942 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/jdbi-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/jdbi-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/leading-tabs-for-java-lambda.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/leading-tabs-for-java-lambda.cfg
index ba1f063e..ba1f063e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/leading-tabs-for-java-lambda.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/leading-tabs-for-java-lambda.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/mod_add_long_class_closebrace_comment-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/mod_add_long_class_closebrace_comment-1.cfg
index c1e8e0ac..c1e8e0ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/mod_add_long_class_closebrace_comment-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/mod_add_long_class_closebrace_comment-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/nl_after_annotation-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/nl_after_annotation-f.cfg
index 405f8ef4..405f8ef4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/nl_after_annotation-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/nl_after_annotation-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/nl_between_annotation-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/nl_between_annotation-f.cfg
index 6a67c354..6a67c354 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/nl_between_annotation-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/nl_between_annotation-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/reflow_fold_regex.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/reflow_fold_regex.txt
index 9a24626f..9a24626f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/reflow_fold_regex.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/reflow_fold_regex.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/sp_after_for_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/sp_after_for_colon.cfg
index 70b19e50..70b19e50 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/sp_after_for_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/sp_after_for_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/sp_this_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/sp_this_paren.cfg
index fc80bb28..fc80bb28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/sp_this_paren.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/sp_this_paren.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/template_angles.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/template_angles.cfg
index 14680e53..14680e53 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/java/template_angles.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/java/template_angles.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/1927.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/1927.cfg
index 3734f63d..a61990fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/1927.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/1927.cfg
@@ -1,3 +1,4 @@
 # 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 = force
+sp_sparen_brace   = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3766.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/3766.cfg
index 610168da..610168da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3766.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/3766.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3767.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/3767.cfg
index 8c30228c..8c30228c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3767.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/3767.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3811.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/3811.cfg
index 20b7d2dc..20b7d2dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3811.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/3811.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3812.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/3812.cfg
index 298c97d3..298c97d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3812.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/3812.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3813.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/3813.cfg
index 298c97d3..298c97d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3813.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/3813.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3819.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/3819.cfg
index 8e10acd4..8e10acd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3819.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/3819.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3823.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/3823.cfg
index fda2290c..fda2290c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/3823.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/3823.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/Issue_2172.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/Issue_2172.cfg
index a4da88d2..a4da88d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/Issue_2172.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/Issue_2172.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/Issue_681.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/Issue_681.cfg
index 901b0c8e..901b0c8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/Issue_681.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/Issue_681.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U08-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/U08-Cpp.cfg
index 1a8d9ead..1a8d9ead 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U08-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/U08-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U09-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/U09-Cpp.cfg
index e8b4846a..e8b4846a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U09-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/U09-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U10-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/U10-Cpp.cfg
index 76c1c8c3..76c1c8c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U10-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/U10-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U11-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/U11-Cpp.cfg
index 07ba9e26..07ba9e26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U11-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/U11-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U12-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/U12-Cpp.cfg
index 581594ac..581594ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U12-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/U12-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U13-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/U13-Cpp.cfg
index 162b13d4..162b13d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U13-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/U13-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U14-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/U14-Cpp.cfg
index 967ea74d..967ea74d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U14-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/U14-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U15-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/U15-Cpp.cfg
index 0d78de45..0d78de45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U15-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/U15-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U24-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/U24-Cpp.cfg
index cea571b8..cea571b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/U24-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/U24-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/UNI-11095.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/UNI-11095.cfg
index 104bc385..f55a617c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/UNI-11095.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/UNI-11095.cfg
@@ -155,7 +155,7 @@ align_on_operator=false
 align_mix_var_proto=false
 align_single_line_func=false
 align_single_line_brace=false
-align_nl_cont=false
+align_nl_cont=0
 align_left_shift=false
 nl_collapse_empty_body=false
 nl_assign_leave_one_liners=true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/align-objc-like-xcode.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/align-objc-like-xcode.cfg
index 3b321b11..3b321b11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/align-objc-like-xcode.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/align-objc-like-xcode.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/align_colon_with_ternary_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/align_colon_with_ternary_1.cfg
index 61ceb8ce..61ceb8ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/align_colon_with_ternary_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/align_colon_with_ternary_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/align_colon_with_ternary_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/align_colon_with_ternary_2.cfg
index 4496f3cb..4496f3cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/align_colon_with_ternary_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/align_colon_with_ternary_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/align_oc_msg_colon_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/align_oc_msg_colon_span-1.cfg
index 9681d152..9681d152 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/align_oc_msg_colon_span-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/align_oc_msg_colon_span-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/block_pointer.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/block_pointer.cfg
index 70c21bbd..70c21bbd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/block_pointer.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/block_pointer.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/blocks.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/blocks.cfg
index 65a1c5e2..65a1c5e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/blocks.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/blocks.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/bug_167.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/bug_167.cfg
index 6ed02f2e..6ed02f2e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/bug_167.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/bug_167.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/bug_340.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/bug_340.cfg
index f56e7a43..f56e7a43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/bug_340.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/bug_340.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/bug_841.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/bug_841.cfg
index 2ab54cc1..2ab54cc1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/bug_841.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/bug_841.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/bug_i_125-412.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/bug_i_125-412.cfg
index 2498ac1b..2498ac1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/bug_i_125-412.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/bug_i_125-412.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/delete-space-oc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/delete-space-oc.cfg
index 4d8a15cb..4d8a15cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/delete-space-oc.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/delete-space-oc.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/double-indent-objc-dict.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/double-indent-objc-dict.cfg
index d4e9a1ae..d4e9a1ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/double-indent-objc-dict.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/double-indent-objc-dict.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/double_angle_space_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/double_angle_space_1.cfg
index 73319da9..73319da9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/double_angle_space_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/double_angle_space_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/double_angle_space_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/double_angle_space_2.cfg
index 8d12b193..8d12b193 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/double_angle_space_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/double_angle_space_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/double_angle_space_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/double_angle_space_3.cfg
index da6a41c2..da6a41c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/double_angle_space_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/double_angle_space_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/gh137.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/gh137.cfg
index 83da02ee..83da02ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/gh137.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/gh137.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/gh293.a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/gh293.a.cfg
index e875a54b..e875a54b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/gh293.a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/gh293.a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/gh293.b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/gh293.b.cfg
index 1dc357ae..1dc357ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/gh293.b.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/gh293.b.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/indent-objc-block.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/indent-objc-block.cfg
index aee5aace..aee5aace 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/indent-objc-block.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/indent-objc-block.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/indent_boxed.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/indent_boxed.cfg
index e20f0820..e20f0820 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/indent_boxed.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/indent_boxed.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/indent_oc_inside_msg_sel.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/indent_oc_inside_msg_sel.cfg
index b140f071..b140f071 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/indent_oc_inside_msg_sel.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/indent_oc_inside_msg_sel.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/indent_single_newline.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/indent_single_newline.cfg
index 1496b522..2f146ef8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/indent_single_newline.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/indent_single_newline.cfg
@@ -1,3 +1,4 @@
-indent_single_newlines = true
+sp_sparen_brace                         = add
+indent_single_newlines                  = true
 indent_columns                          = 4             # number
 indent_with_tabs                        = 0             # number
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/issue_2643.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/issue_2643.cfg
index 7f188f21..7f188f21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/issue_2643.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/issue_2643.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/issue_2656.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/issue_2656.cfg
index 3b020c33..3b020c33 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/issue_2656.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/issue_2656.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/issue_2675.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/issue_2675.cfg
index 0eab0244..0eab0244 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/issue_2675.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/issue_2675.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/issue_3031.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/issue_3031.cfg
index 8234c643..8234c643 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/issue_3031.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/issue_3031.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_grouping_enabled.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/mod_sort_incl_import_grouping_enabled.cfg
index d88bf262..d88bf262 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_grouping_enabled.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/mod_sort_incl_import_grouping_enabled.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_grouping_enabled_with_regex.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/mod_sort_incl_import_grouping_enabled_with_regex.cfg
index 5724b52e..5724b52e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_grouping_enabled_with_regex.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/mod_sort_incl_import_grouping_enabled_with_regex.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_ignore_extension.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/mod_sort_incl_import_ignore_extension.cfg
index d49491cb..d49491cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_ignore_extension.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/mod_sort_incl_import_ignore_extension.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_prioritize_angle_over_quotes.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/mod_sort_incl_import_prioritize_angle_over_quotes.cfg
index 475ab734..475ab734 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_prioritize_angle_over_quotes.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/mod_sort_incl_import_prioritize_angle_over_quotes.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_prioritize_extensionless.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/mod_sort_incl_import_prioritize_extensionless.cfg
index aa9eb1db..aa9eb1db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_prioritize_extensionless.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/mod_sort_incl_import_prioritize_extensionless.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_prioritize_filename.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/mod_sort_incl_import_prioritize_filename.cfg
index 2661a68a..2661a68a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/mod_sort_incl_import_prioritize_filename.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/mod_sort_incl_import_prioritize_filename.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_after_func_body-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/nl_after_func_body-3.cfg
index 65f1fa5a..65f1fa5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_after_func_body-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/nl_after_func_body-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_brace_square.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/nl_brace_square.cfg
index 60d2fb97..60d2fb97 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_brace_square.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/nl_brace_square.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_func_call_args_multi_line_ignore_closures.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/nl_func_call_args_multi_line_ignore_closures.cfg
index e480140e..e480140e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_func_call_args_multi_line_ignore_closures.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/nl_func_call_args_multi_line_ignore_closures.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_oc_block_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/nl_oc_block_brace-f.cfg
index 824fc747..824fc747 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_oc_block_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/nl_oc_block_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_oc_msg_args_max_code_width.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/nl_oc_msg_args_max_code_width.cfg
index 197f0eb3..197f0eb3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_oc_msg_args_max_code_width.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/nl_oc_msg_args_max_code_width.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_oc_msg_args_min_params.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/nl_oc_msg_args_min_params.cfg
index d0d3f935..d0d3f935 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/nl_oc_msg_args_min_params.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/nl_oc_msg_args_min_params.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/obj-c-available.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/obj-c-available.cfg
index f77790fc..f77790fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/obj-c-available.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/obj-c-available.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/obj-c-properties.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/obj-c-properties.cfg
index 98241779..98241779 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/obj-c-properties.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/obj-c-properties.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/objc_bug_497.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/objc_bug_497.cfg
index 0015f97d..0015f97d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/objc_bug_497.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/objc_bug_497.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/objc_complex_method.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/objc_complex_method.cfg
index 8d82b960..8d82b960 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/objc_complex_method.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/objc_complex_method.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc1.cfg
index 659131cf..659131cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc10.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc10.cfg
index d50a20d8..d50a20d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc10.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc10.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc11.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc11.cfg
index e355d765..e355d765 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc11.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc11.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc12.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc12.cfg
index 4f069fed..4f069fed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc12.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc12.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc13.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc13.cfg
index 4466b37a..4466b37a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc13.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc13.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc14.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc14.cfg
index a44950db..a44950db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc14.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc14.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc16.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc16.cfg
index 5eec46e9..5eec46e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc16.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc16.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc17.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc17.cfg
index 18b27823..18b27823 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc17.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc17.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc18.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc18.cfg
index 96003cf5..96003cf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc18.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc18.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc19.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc19.cfg
index d68c95f0..d68c95f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc19.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc19.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc2.cfg
index 43d02a66..43d02a66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc4.cfg
index f2de050e..f2de050e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc5.cfg
index 77a7a7af..77a7a7af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc6.cfg
index c1bcd8d4..c1bcd8d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc6.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc6.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc7.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc7.cfg
index 972ab19a..972ab19a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc7.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc7.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc8.cfg
index 3f577ab8..3f577ab8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc8.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc8.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc9.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc9.cfg
index 92ed39d4..92ed39d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc9.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc9.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc_bug_1674.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc_bug_1674.cfg
index 31e4537c..31e4537c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc_bug_1674.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc_bug_1674.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc_bug_1683.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc_bug_1683.cfg
index b5d4249d..b5d4249d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc_bug_1683.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc_bug_1683.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc_cond_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc_cond_colon.cfg
index b86516e0..b86516e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/oc_cond_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/oc_cond_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_at_sel_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_after_oc_at_sel_add.cfg
index 817ec7c5..817ec7c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_at_sel_add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_after_oc_at_sel_add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_at_sel_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_after_oc_at_sel_force.cfg
index b2a79b8f..b2a79b8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_at_sel_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_after_oc_at_sel_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_at_sel_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_after_oc_at_sel_remove.cfg
index 98b6de42..98b6de42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_at_sel_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_after_oc_at_sel_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_block_caret_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_after_oc_block_caret_add.cfg
index e5e4fcdf..e5e4fcdf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_block_caret_add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_after_oc_block_caret_add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_block_caret_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_after_oc_block_caret_force.cfg
index 3194126d..3194126d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_block_caret_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_after_oc_block_caret_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_return_type_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_after_oc_return_type_add.cfg
index b321b9aa..b321b9aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_return_type_add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_after_oc_return_type_add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_return_type_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_after_oc_return_type_force.cfg
index fb8b9a1b..fb8b9a1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_return_type_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_after_oc_return_type_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_return_type_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_after_oc_return_type_remove.cfg
index 1110a1eb..1110a1eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_oc_return_type_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_after_oc_return_type_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_send_oc_colon-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_after_send_oc_colon-f.cfg
index 2a54dd6f..2a54dd6f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_send_oc_colon-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_after_send_oc_colon-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_throw_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_after_throw_remove.cfg
index 6b6bc0ac..6b6bc0ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_after_throw_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_after_throw_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_before_oc_block_caret_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_before_oc_block_caret_force.cfg
index bd8863a3..bd8863a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_before_oc_block_caret_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_before_oc_block_caret_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_before_oc_block_caret_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_before_oc_block_caret_remove.cfg
index 2a001cbc..2a001cbc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_before_oc_block_caret_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_before_oc_block_caret_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_before_oc_proto_list_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_before_oc_proto_list_add.cfg
index 3374e228..3374e228 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_before_oc_proto_list_add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_before_oc_proto_list_add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_before_oc_proto_list_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_before_oc_proto_list_force.cfg
index 5be78fac..5be78fac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_before_oc_proto_list_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_before_oc_proto_list_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_before_oc_proto_list_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_before_oc_proto_list_remove.cfg
index 9f93f4a5..9f93f4a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_before_oc_proto_list_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_before_oc_proto_list_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_block_as_argument.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_block_as_argument.cfg
index 60c651fb..60c651fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_block_as_argument.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_block_as_argument.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_block_as_argument2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_block_as_argument2.cfg
index 8f297d7d..8f297d7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_block_as_argument2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_block_as_argument2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_block_as_argument3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_block_as_argument3.cfg
index 17059e47..17059e47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_block_as_argument3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_block_as_argument3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_block_as_argument4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_block_as_argument4.cfg
index 8caf60bc..8caf60bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_block_as_argument4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_block_as_argument4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_block_as_argument5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_block_as_argument5.cfg
index 42e8c380..42e8c380 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_block_as_argument5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_block_as_argument5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_cond_ternary_short.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_cond_ternary_short.cfg
index 564b2dcf..564b2dcf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_cond_ternary_short.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_cond_ternary_short.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_enum_paren-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_enum_paren-i.cfg
index 5bb98ec2..5bb98ec2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_enum_paren-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_enum_paren-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_enum_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_enum_paren-r.cfg
index f155e201..f155e201 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_enum_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_enum_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_boxed.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_oc_boxed.cfg
index 73939de1..73939de1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_boxed.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_oc_boxed.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_catch-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_oc_catch-i.cfg
index 98e8f829..46276a43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_catch-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_oc_catch-i.cfg
@@ -1,3 +1,4 @@
+sp_sparen_brace   = add
 sp_oc_catch_paren = ignore
 sp_catch_paren    = add
 sp_oc_catch_brace = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_catch-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_oc_catch-r.cfg
index 789e2872..3f582f7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_catch-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_oc_catch-r.cfg
@@ -1,3 +1,4 @@
+sp_sparen_brace   = add
 sp_oc_catch_paren = remove
 sp_catch_paren    = add
 sp_oc_catch_brace = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_catch.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_oc_catch.cfg
index 7367541a..bb9f73fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_catch.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_oc_catch.cfg
@@ -1,3 +1,4 @@
+sp_sparen_brace                 = add
 sp_oc_catch_paren               = force
 sp_catch_paren                  = add      # ignore/add/remove/force
 sp_oc_catch_brace               = add      # ignore/add/remove/force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_classname_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_oc_classname_paren-r.cfg
index ba92279e..ba92279e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_classname_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_oc_classname_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_synchronized.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_oc_synchronized.cfg
index 5056f70f..f9bd3517 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/sp_oc_synchronized.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/sp_oc_synchronized.cfg
@@ -1 +1,2 @@
+sp_sparen_brace                 = add
 sp_after_oc_synchronized        = force    # ignore/add/remove/force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/ternary_short.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/ternary_short.cfg
index 55e708cf..55e708cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/oc/ternary_short.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/oc/ternary_short.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/Issue_2586.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/pawn/Issue_2586.cfg
index ff46f80d..ff46f80d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/Issue_2586.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/pawn/Issue_2586.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/Issue_2665.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/pawn/Issue_2665.cfg
index 763864c0..763864c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/Issue_2665.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/pawn/Issue_2665.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/amxmodx.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/pawn/amxmodx.cfg
index 95ca5a4d..95ca5a4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/amxmodx.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/pawn/amxmodx.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/mod_full_brace_function-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/pawn/mod_full_brace_function-f.cfg
index 8d44cc3b..8d44cc3b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/mod_full_brace_function-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/pawn/mod_full_brace_function-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/pawn-escape.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/pawn/pawn-escape.cfg
index 8d10ec23..ae141f03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/pawn-escape.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/pawn/pawn-escape.cfg
@@ -1,3 +1,4 @@
+sp_sparen_brace                 = add
 string_escape_char              = 94  # '^'
 indent_columns                  = 4
 indent_with_tabs                = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/pawn.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/pawn/pawn.cfg
index 7859328a..ed66c177 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/pawn/pawn.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/pawn/pawn.cfg
@@ -1,4 +1,5 @@
 input_tab_size                  = 4
+sp_sparen_brace                 = add
 sp_arith                        = force
 sp_after_tag                    = remove
 sp_inside_braces                = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/staging/UNI-58354.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/staging/UNI-58354.cfg
index fb9ca61b..fb9ca61b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/staging/UNI-58354.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/staging/UNI-58354.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/staging/UNI-64325.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/staging/UNI-64325.cfg
index 44ee8b48..44ee8b48 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/staging/UNI-64325.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/staging/UNI-64325.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/Issue_2090.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/Issue_2090.cfg
index 154cff70..154cff70 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/Issue_2090.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/Issue_2090.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/Issue_2270.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/Issue_2270.cfg
index 43cc3757..43cc3757 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/Issue_2270.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/Issue_2270.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_100.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/ben_100.cfg
index 81cd4430..81cd4430 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_100.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/ben_100.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_101.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/ben_101.cfg
index 50078f96..50078f96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_101.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/ben_101.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_102.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/ben_102.cfg
index 3a37ba17..3a37ba17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_102.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/ben_102.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_103.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/ben_103.cfg
index e7bc6b90..e7bc6b90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_103.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/ben_103.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_104.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/ben_104.cfg
index 80870cfe..80870cfe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_104.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/ben_104.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_105.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/ben_105.cfg
index 23452bfd..23452bfd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/ben_105.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/ben_105.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/mda_space_a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/mda_space_a.cfg
index b0a66bcb..b0a66bcb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/mda_space_a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/mda_space_a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/mda_space_c.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/mda_space_c.cfg
index a8eaaaa2..a8eaaaa2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/mda_space_c.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/mda_space_c.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/nullable.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/nullable.cfg
index 5c47913d..5c47913d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/nullable.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/nullable.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/sp_after_comma-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/sp_after_comma-a.cfg
index 35ee933a..35ee933a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/config/vala/sp_after_comma-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/config/vala/sp_after_comma-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cpp.test b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cpp.test
index cdd407d7..580d284f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/cpp.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/cpp.test
@@ -13,6 +13,12 @@
 30001  cpp/sp_angle_colon.cfg                               cpp/alt_tokens.cpp
 30002  cpp/ben_003.cfg                                      cpp/constructor.cpp
 30003  cpp/ben_004.cfg                                      cpp/strings.cpp
+30004  cpp/Issue_4036.cfg                                   cpp/Issue_4036.cpp
+30005  common/empty.cfg                                     cpp/Issue_4042.cpp
+30006  common/empty.cfg                                     cpp/Issue_4027.cpp
+30007  cpp/Issue_4080.cfg                                   cpp/Issue_4080.cpp
+30008  cpp/Issue_4094.cfg                                   cpp/Issue_4094.cpp
+30009  cpp/Issue_3236.cfg                                   cpp/Issue_3236.cpp
 
 30010  cpp/ben_005.cfg                                      cpp/class.h
 30011  cpp/ben_006.cfg                                      cpp/misc.cpp
@@ -160,6 +166,25 @@
 30139  cpp/Issue_3604.cfg                                   cpp/Issue_3604.cpp
 
 30140  cpp/Issue_3785.cfg                                   cpp/Issue_3785.cpp
+30141  cpp/Issue_1130.cfg                                   cpp/Issue_1130.cpp
+30142  cpp/Issue_3915.cfg                                   cpp/Issue_3915.cpp
+30143  cpp/Issue_3919.cfg                                   cpp/Issue_3919.cpp
+30144  cpp/Issue_3916.cfg                                   cpp/Issue_3916.cpp
+30145  cpp/Issue_3914.cfg                                   cpp/Issue_3914.cpp
+30146  cpp/Issue_3614.cfg                                   cpp/Issue_3614.cpp
+30147  cpp/Issue_3965.cfg                                   cpp/Issue_3965.cpp
+30148  cpp/Issue_3965.cfg                                   cpp/Issue_3965-2.cpp
+30149  cpp/Issue_3967.cfg                                   cpp/Issue_3967.cc
+
+30150  cpp/Issue_3983.cfg                                   cpp/Issue_3983.cpp
+30151  cpp/Issue_3983.cfg                                   cpp/Issue_3996.cpp
+30152  cpp/Issue_3983.cfg                                   cpp/Issue_4023.cpp
+30153  cpp/Issue_3983.cfg                                   cpp/Issue_4026.cpp
+30154  common/empty.cfg                                     cpp/Issue_4132.cpp
+
+30160  common/empty.cfg                                     cpp/Issue_3980.cpp
+30161  cpp/Discussion_3987.cfg                              cpp/Discussion_3987.cpp
+30162  cpp/Issue_4239.cfg                                   cpp/Issue_4239.cpp
 
 30200  cpp/bug_1862.cfg                                     cpp/bug_1862.cpp
 30201  cpp/cmt_indent-1.cfg                                 cpp/cmt_indent.cpp
@@ -199,6 +224,7 @@
 30234  cpp/functype_param-r.cfg                             cpp/functype_param.cpp
 30235  cpp/functype_param-f.cfg                             cpp/functype_param.cpp
 30236  cpp/Issue_750.cfg                                    cpp/Issue_750.cpp
+30237  cpp/Issue_3920.cfg                                   cpp/Issue_3920.cpp
 
 30240  cpp/align_func_params-t.cfg                          cpp/align_func_params.cpp
 30241  cpp/align_func_params_span-1.cfg                     cpp/align_func_params.cpp
@@ -287,6 +313,13 @@
 
 30330  cpp/Issue_3080.cfg                                   cpp/Issue_3080.cpp
 
+30340  cpp/issue_3105_1_neg.cfg                             cpp/issue_3105_1.cpp
+30341  cpp/issue_3105_1_pos.cfg                             cpp/issue_3105_1.cpp
+30342  cpp/issue_3105_1_zero.cfg                            cpp/issue_3105_1.cpp
+30343  cpp/issue_3105_2_neg.cfg                             cpp/issue_3105_2.cpp
+30344  cpp/issue_3105_2_pos.cfg                             cpp/issue_3105_2.cpp
+30345  cpp/issue_3105_2_zero.cfg                            cpp/issue_3105_2.cpp
+
 30400  common/attribute_specifier_seqs.cfg                  cpp/attribute_specifier_seqs.cpp
 30401  cpp/Issue_2570.cfg                                   cpp/Issue_2570.cpp
 
@@ -489,6 +522,8 @@
 30962  cpp/nl_assign_leave_one_liners.cfg                   cpp/nl_assign_leave_one_liners.cpp
 30963  cpp/Issue_2907.cfg                                   cpp/Issue_2907.cpp
 30964  cpp/Issue_2823.cfg                                   cpp/Issue_2823.cpp
+30965  cpp/return_remove.cfg                                cpp/return_remove.cpp
+30966  cpp/return_dont_remove.cfg                           cpp/return_remove.cpp
 
 30970  cpp/Issue_2219.cfg                                   cpp/Issue_2219.cpp
 30971  cpp/Issue_2224.cfg                                   cpp/Issue_2224.cpp
@@ -568,6 +603,10 @@
 31635  common/empty.cfg                                     cpp/sp_decltype.cpp
 31636  cpp/Issue_1923.cfg                                   cpp/Issue_1923.cpp
 31637  cpp/Issue_3446.cfg                                   cpp/Issue_3446.cpp
+31638  cpp/sp_between_ptr_ref-a.cfg                         cpp/misc2.cpp
+31639  cpp/sp_between_ptr_ref-r.cfg                         cpp/misc2.cpp
+31640  cpp/sp_between_ptr_ref-f.cfg                         cpp/misc2.cpp
+31641  cpp/sp_between_ptr_ref-i.cfg                         cpp/misc2.cpp
 
 31660  cpp/var_def_blks-1.cfg                               cpp/issue_1919.cpp
 31661  cpp/Issue_3097.cfg                                   cpp/Issue_3097.cpp
@@ -804,6 +843,8 @@
 34143  cpp/I1112-2.cfg                                      cpp/I1112-2.cpp
 34144  cpp/sp_before_ptr_star-r.cfg                         cpp/I1112-3.cpp
 34145  cpp/i683.cfg                                         cpp/i683.cpp
+# need to be solved,
+#                                                            https://github.com/uncrustify/uncrustify/issues/3924
 34146  cpp/sp_bool-f.cfg                                    cpp/bug_1002.cpp
 34147  cpp/sp_bool-r.cfg                                    cpp/bug_1002.cpp
 34148  cpp/nl_before_if_closing_paren-f.cfg                 cpp/bug_1139.cpp
@@ -878,6 +919,7 @@
 34255  cpp/eat_blanks_after_codewidth.cfg                   cpp/eat_blanks_after_codewidth.cpp
 34256  cpp/Issue_2836.cfg                                   cpp/Issue_2836.cpp
 34257  cpp/code_width-70.cfg                                cpp/brace_init_stdint_macros.cpp
+34258  common/tde.cfg                                       cpp/long_lines.cpp
 
 34280  cpp/UNI-29935.cfg                                    cpp/UNI-29935.cpp
 
@@ -1132,3 +1174,39 @@
 60089  cpp/Issue_3863.cfg                                   cpp/Issue_3863.cpp
 60090  cpp/Issue_3863.cfg                                   cpp/Issue_3863_2.cpp
 60091  cpp/Issue_3863.cfg                                   cpp/Issue_3863_3.cpp
+60092  cpp/Issue_3865.cfg                                   cpp/Issue_3865.cpp
+60093  cpp/Issue_3865_2.cfg                                 cpp/Issue_3865.cpp
+
+60100  cpp/sp_qualifier_unnamed_ptr_star-i.cfg              cpp/sp_qualifier_ptr_star.cpp
+60101  cpp/sp_qualifier_unnamed_ptr_star-a.cfg              cpp/sp_qualifier_ptr_star.cpp
+60102  cpp/sp_qualifier_unnamed_ptr_star-r.cfg              cpp/sp_qualifier_ptr_star.cpp
+60103  cpp/sp_qualifier_unnamed_ptr_star-f.cfg              cpp/sp_qualifier_ptr_star.cpp
+60104  cpp/sp_qualifier_ptr_star_func-i.cfg                 cpp/sp_qualifier_ptr_star.cpp
+60105  cpp/sp_qualifier_ptr_star_func-a.cfg                 cpp/sp_qualifier_ptr_star.cpp
+60106  cpp/sp_qualifier_ptr_star_func-r.cfg                 cpp/sp_qualifier_ptr_star.cpp
+60107  cpp/sp_qualifier_ptr_star_func-f.cfg                 cpp/sp_qualifier_ptr_star.cpp
+60108  cpp/sp_qualifier_ptr_star_trailing-i.cfg             cpp/sp_qualifier_ptr_star.cpp
+60109  cpp/sp_qualifier_ptr_star_trailing-a.cfg             cpp/sp_qualifier_ptr_star.cpp
+60110  cpp/sp_qualifier_ptr_star_trailing-r.cfg             cpp/sp_qualifier_ptr_star.cpp
+60111  cpp/sp_qualifier_ptr_star_trailing-f.cfg             cpp/sp_qualifier_ptr_star.cpp
+60112  cpp/sp_before_qualifier_ptr_star-i.cfg               cpp/sp_before_not_var_ptr_star.cpp
+60113  cpp/sp_before_qualifier_ptr_star-a.cfg               cpp/sp_before_not_var_ptr_star.cpp
+60114  cpp/sp_before_qualifier_ptr_star-r.cfg               cpp/sp_before_not_var_ptr_star.cpp
+60115  cpp/sp_before_qualifier_ptr_star-f.cfg               cpp/sp_before_not_var_ptr_star.cpp
+60116  cpp/sp_before_operator_ptr_star-i.cfg                cpp/sp_before_not_var_ptr_star.cpp
+60117  cpp/sp_before_operator_ptr_star-a.cfg                cpp/sp_before_not_var_ptr_star.cpp
+60118  cpp/sp_before_operator_ptr_star-r.cfg                cpp/sp_before_not_var_ptr_star.cpp
+60119  cpp/sp_before_operator_ptr_star-f.cfg                cpp/sp_before_not_var_ptr_star.cpp
+60120  cpp/sp_before_scope_ptr_star-i.cfg                   cpp/sp_before_not_var_ptr_star.cpp
+60121  cpp/sp_before_scope_ptr_star-a.cfg                   cpp/sp_before_not_var_ptr_star.cpp
+60122  cpp/sp_before_scope_ptr_star-r.cfg                   cpp/sp_before_not_var_ptr_star.cpp
+60123  cpp/sp_before_scope_ptr_star-f.cfg                   cpp/sp_before_not_var_ptr_star.cpp
+60124  cpp/sp_before_global_scope_ptr_star-i.cfg            cpp/sp_before_not_var_ptr_star.cpp
+60125  cpp/sp_before_global_scope_ptr_star-a.cfg            cpp/sp_before_not_var_ptr_star.cpp
+60126  cpp/sp_before_global_scope_ptr_star-r.cfg            cpp/sp_before_not_var_ptr_star.cpp
+60127  cpp/sp_before_global_scope_ptr_star-f.cfg            cpp/sp_before_not_var_ptr_star.cpp
+
+60160  cpp/nl_min_after_func_body.cfg                       cpp/nl_func.cpp
+60161  cpp/nl_min_after_func_body.cfg                       cpp/nl_func-2.cpp
+60162  cpp/nl_max_after_func_body.cfg                       cpp/nl_func.cpp
+60163  cpp/nl_max_after_func_body.cfg                       cpp/nl_func-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/d.test b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/d.test
index 520a8c3a..520a8c3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/d.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/d.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/difftest.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/difftest.sh
index 053cae17..053cae17 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/difftest.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/difftest.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/ecma.test b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/ecma.test
index 632f3015..632f3015 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/ecma.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/ecma.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/examine_p_files.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/examine_p_files.sh
index 327f755b..327f755b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/examine_p_files.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/examine_p_files.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00000-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00000-comment-indent.c
index b59ab389..b59ab389 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00000-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00000-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00001-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00001-comment-indent.c
index e4ba53de..e4ba53de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00001-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00001-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00002-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00002-comment-indent.c
index 09ca01ac..09ca01ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00002-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00002-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00003-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00003-comment-indent.c
index 0f906f2f..0f906f2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00003-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00003-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00004-switch.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00004-switch.c
index ffb54327..ffb54327 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00004-switch.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00004-switch.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00005-cmt-align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00005-cmt-align.c
index 5e773be1..5e773be1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00005-cmt-align.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00005-cmt-align.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00006-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00006-comment-convert.c
index c7a019f7..c7a019f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00006-comment-convert.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00006-comment-convert.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00007-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00007-comment-convert.c
index 886d7698..886d7698 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00007-comment-convert.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00007-comment-convert.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00008-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00008-comment-convert.c
index c2af0f8b..c2af0f8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00008-comment-convert.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00008-comment-convert.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00009-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00009-comment-convert.c
index 0d3f218a..0d3f218a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00009-comment-convert.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00009-comment-convert.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00010-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00010-braces.c
index c4dc5faf..c4dc5faf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00010-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00010-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00011-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00011-braces.c
index 893a32f6..893a32f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00011-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00011-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00012-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00012-braces.c
index 851f4df9..851f4df9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00012-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00012-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00013-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00013-braces.c
index 2adcab76..2adcab76 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00013-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00013-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00014-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00014-braces.c
index 1966a0c7..1966a0c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00014-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00014-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00015-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00015-braces.c
index c29cdecd..c29cdecd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00015-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00015-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00016-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00016-braces.c
index ce7df756..ce7df756 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00016-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00016-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00020-define-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00020-define-if-indent.c
index f7efd78c..f7efd78c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00020-define-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00020-define-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00050-brace-remove.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00050-brace-remove.c
index 857e4031..857e4031 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00050-brace-remove.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00050-brace-remove.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00051-brace-remove.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00051-brace-remove.c
index bef3e64d..bef3e64d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00051-brace-remove.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00051-brace-remove.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00052-brace-remove2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00052-brace-remove2.c
index 30f352c6..30f352c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00052-brace-remove2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00052-brace-remove2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00053-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00053-brace.c
index 55c45a57..55c45a57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00053-brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00053-brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00054-if_chain.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00054-if_chain.c
index a6e0c561..a6e0c561 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00054-if_chain.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00054-if_chain.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00055-braces-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00055-braces-2.c
index 38447f86..38447f86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00055-braces-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00055-braces-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00056-brace-remove3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00056-brace-remove3.c
index 258ca555..258ca555 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00056-brace-remove3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00056-brace-remove3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00057-brace-remove3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00057-brace-remove3.c
index 26b22e2c..26b22e2c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00057-brace-remove3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00057-brace-remove3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00058-if_chain.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00058-if_chain.c
index ba15dc8e..ba15dc8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00058-if_chain.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00058-if_chain.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00059-Issue_2205.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00059-Issue_2205.c
new file mode 100644
index 00000000..632e8a28
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00059-Issue_2205.c
@@ -0,0 +1,6 @@
+// 2205
+#define MLX_RATE(ee_val) (ee_val & MLX_MASK)
+
+// 3559
+#define my_2_thing(stuff) & object3, & object4
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00060-braces-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00060-braces-2.c
index 38447f86..38447f86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00060-braces-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00060-braces-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00061-braces-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00061-braces-3.c
index 18784b82..18784b82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00061-braces-3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00061-braces-3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00062-braces-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00062-braces-4.c
index 05c0d9b5..05c0d9b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00062-braces-4.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00062-braces-4.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00065-braces-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00065-braces-5.c
index 6e1e6cab..6e1e6cab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00065-braces-5.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00065-braces-5.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00066-vb-while.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00066-vb-while.c
index c189b7b7..c189b7b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00066-vb-while.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00066-vb-while.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00067-vb-do.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00067-vb-do.c
index 79c6dedf..79c6dedf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00067-vb-do.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00067-vb-do.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00068-bsnl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00068-bsnl.c
index 310e0eb2..310e0eb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00068-bsnl.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00068-bsnl.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00069-vb-pp.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00069-vb-pp.c
index 9fb79a06..9fb79a06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00069-vb-pp.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00069-vb-pp.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00070-return-multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00070-return-multi.c
index d351cdb0..d351cdb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00070-return-multi.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00070-return-multi.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00071-include_define.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00071-include_define.h
index 89f11e5a..89f11e5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00071-include_define.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00071-include_define.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00072-align-proto.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00072-align-proto.c
index 15746cd9..15746cd9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00072-align-proto.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00072-align-proto.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00073-nl_proto_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00073-nl_proto_endif.c
index f50766b8..f50766b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00073-nl_proto_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00073-nl_proto_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00074-clang-has_include.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00074-clang-has_include.h
index 976de29d..976de29d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00074-clang-has_include.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00074-clang-has_include.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00075-function_prototypes_alignment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00075-function_prototypes_alignment.c
new file mode 100644
index 00000000..869015d0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00075-function_prototypes_alignment.c
@@ -0,0 +1,21 @@
+libr_intstatus set_data1(libr_file *file_handle, libr_section *scn, libr_data *data, off_t offset,
+        char *buffer, size_t size);
+void           write_output1(libr_file *file_handle);
+libr_intstatus open_handles1(libr_file *file_handle, char *filename, libr_access_t access);
+
+libr_intstatus set_data2(libr_file *file_handle, libr_section *scn, libr_data *data, off_t offset,
+        char *buffer, size_t size);
+libr_intstatus open_handles2(libr_file *file_handle, char *filename, libr_access_t access);
+void           write_output2(libr_file *file_handle);
+
+INTERNAL_FN libr_intstatus set_data1(libr_file *file_handle, libr_section *scn, libr_data *data,
+        off_t offset, char *buffer, size_t size);
+INTERNAL_FN void           write_output1(libr_file *file_handle);
+INTERNAL_FN libr_intstatus open_handles1(libr_file *file_handle, char *filename,
+        libr_access_t access);
+
+INTERNAL_FN libr_intstatus set_data2(libr_file *file_handle, libr_section *scn, libr_data *data,
+        off_t offset, char *buffer, size_t size);
+INTERNAL_FN libr_intstatus open_handles2(libr_file *file_handle, char *filename,
+        libr_access_t access);
+INTERNAL_FN void           write_output2(libr_file *file_handle);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00076-1225.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00076-1225.c
index 5b51cf3c..5b51cf3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00076-1225.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00076-1225.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00081-else-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00081-else-if.c
index ff5f5b21..ff5f5b21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00081-else-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00081-else-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00082-else-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00082-else-if.c
index 06cc37f2..06cc37f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00082-else-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00082-else-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00083-Issue_3601.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00083-Issue_3601.c
index a2b92fa0..a2b92fa0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00083-Issue_3601.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00083-Issue_3601.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00091-cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00091-cond.c
index 840d4a6c..840d4a6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00091-cond.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00091-cond.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00092-cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00092-cond.c
index a718a48b..a718a48b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00092-cond.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00092-cond.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00093-cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00093-cond.c
index 8d55652a..8d55652a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00093-cond.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00093-cond.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00094-Issue_3457.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00094-Issue_3457.c
index c6096135..c6096135 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00094-Issue_3457.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00094-Issue_3457.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00101-bugs-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00101-bugs-1.c
index abc2e08e..abc2e08e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00101-bugs-1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00101-bugs-1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00102-bugs-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00102-bugs-2.c
index 42bed259..42bed259 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00102-bugs-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00102-bugs-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00103-bugs-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00103-bugs-3.c
index 07d410b1..07d410b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00103-bugs-3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00103-bugs-3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00104-bugs-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00104-bugs-4.c
index 61885443..61885443 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00104-bugs-4.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00104-bugs-4.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00105-bugs-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00105-bugs-5.c
index 72bfbe4d..72bfbe4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00105-bugs-5.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00105-bugs-5.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00106-bugs-6.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00106-bugs-6.c
index 302c2328..302c2328 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00106-bugs-6.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00106-bugs-6.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00107-bugs-7.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00107-bugs-7.c
index 34fc146e..34fc146e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00107-bugs-7.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00107-bugs-7.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00108-bugs-8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00108-bugs-8.c
index 0eae4dff..0eae4dff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00108-bugs-8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00108-bugs-8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00110-misc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00110-misc.c
index fdca271b..fdca271b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00110-misc.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00110-misc.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00111-misc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00111-misc.c
index ad40a4ea..ad40a4ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00111-misc.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00111-misc.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00120-sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00120-sp_cmt_cpp_start.c
index 74a333c5..74a333c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00120-sp_cmt_cpp_start.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00120-sp_cmt_cpp_start.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00121-sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00121-sp_cmt_cpp_start.c
index 3160a288..3160a288 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00121-sp_cmt_cpp_start.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00121-sp_cmt_cpp_start.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00122-sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00122-sp_cmt_cpp_start.c
index fe237c5a..fe237c5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00122-sp_cmt_cpp_start.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00122-sp_cmt_cpp_start.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00123-cmt_reflow.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00123-cmt_reflow.c
index 44e0cf34..44e0cf34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00123-cmt_reflow.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00123-cmt_reflow.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00130-minus-minus.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00130-minus-minus.c
index debe70a8..debe70a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00130-minus-minus.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00130-minus-minus.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00131-Issue_3873.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00131-Issue_3873.c
index a0dc10df..a0dc10df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00131-Issue_3873.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00131-Issue_3873.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00135-br_cmt.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00135-br_cmt.c
index 9e6c6de9..9e6c6de9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00135-br_cmt.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00135-br_cmt.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00136-Issue_4044.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00136-Issue_4044.c
new file mode 100644
index 00000000..88b99686
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00136-Issue_4044.c
@@ -0,0 +1,58 @@
+int main(void) {
+	f(1, and_eq.x);
+	f(1, and.x);
+	f(1, asm.x);
+	f(1, atomic_cancel.x);
+	f(1, atomic_commit.x);
+	f(1, atomic_noexcept.x);
+	f(1, bitand.x);
+	f(1, bitor.x);
+	f(1, catch.x);
+	f(1, char16_t.x);
+	f(1, char32_t.x);
+	f(1, char8_t.x);
+	f(1, class.x);
+	f(1, co_await.x);
+	f(1, compl.x);
+	f(1, concept.x);
+	f(1, const_cast.x);
+	f(1, consteval.x);
+	f(1, constinit.x);
+	f(1, co_return.x);
+	f(1, co_yield.x);
+	f(1, decltype.x);
+	f(1, delete.x);
+	f(1, dynamic_cast.x);
+	f(1, explicit.x);
+	f(1, export.x);
+	f(1, friend.x);
+	f(1, mutable.x);
+	f(1, namespace.x);
+	f(1, new.x);
+	f(1, noexcept.x);
+	f(1, normal.x);
+	f(1, not_eq.x);
+	f(1, not.x);
+	f(1, operator.x);
+	f(1, or_eq.x);
+	f(1, or.x);
+	f(1, private.x);
+	f(1, protected.x);
+	f(1, public.x);
+	f(1, reflexpr.x);
+	f(1, reinterpret_cast.x);
+	f(1, requires.x);
+	f(1, static_cast.x);
+	f(1, synchronized.x);
+	f(1, template.x);
+	f(1, this.x);
+	f(1, throw.x);
+	f(1, try.x);
+	f(1, typeid.x);
+	f(1, typename.x);
+	f(1, using.x);
+	f(1, virtual.x);
+	f(1, wchar_t.x);
+	f(1, xor_eq.x);
+	f(1, xor.x);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00140-global-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00140-global-vars.c
index 0df79336..0df79336 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00140-global-vars.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00140-global-vars.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00141-deref.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00141-deref.c
index a7ad3f5e..a7ad3f5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00141-deref.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00141-deref.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00142-type-cast.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00142-type-cast.c
index 93076825..93076825 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00142-type-cast.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00142-type-cast.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00143-t3.in.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00143-t3.in.c
index b40fbd17..b40fbd17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00143-t3.in.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00143-t3.in.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00144-align-proto-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00144-align-proto-vars.c
index c7bf6081..c7bf6081 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00144-align-proto-vars.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00144-align-proto-vars.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00145-vardefcol.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00145-vardefcol.c
index 1238be0d..1238be0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00145-vardefcol.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00145-vardefcol.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00146-Issue_3516.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00146-Issue_3516.c
index 828d2611..828d2611 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00146-Issue_3516.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00146-Issue_3516.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00147-Issue_3516.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00147-Issue_3516.c
index 63b9a440..63b9a440 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00147-Issue_3516.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00147-Issue_3516.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00148-Issue_3518.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00148-Issue_3518.c
index cf8d0c95..cf8d0c95 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00148-Issue_3518.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00148-Issue_3518.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00150-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00150-casts.c
index d89ad598..d89ad598 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00150-casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00150-casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00151-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00151-casts.c
index 9f2a13de..9f2a13de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00151-casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00151-casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00152-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00152-casts.c
index acc2ebe4..acc2ebe4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00152-casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00152-casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00153-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00153-casts.c
index 8bf710b6..8bf710b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00153-casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00153-casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00154-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00154-casts.c
index fca4010b..fca4010b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00154-casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00154-casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00155-cast_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00155-cast_brace.c
index 6e8f12b2..6e8f12b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00155-cast_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00155-cast_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00156-empty-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00156-empty-braces.c
index d7905dfa..d7905dfa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00156-empty-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00156-empty-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00157-empty-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00157-empty-braces.c
index 328af18d..328af18d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00157-empty-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00157-empty-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00158-empty-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00158-empty-braces.c
index 8182538f..8182538f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00158-empty-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00158-empty-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00159-empty-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00159-empty-braces.c
index d49e27d5..d49e27d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00159-empty-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00159-empty-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00160-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00160-fcn_indent.c
index 23c173c2..23c173c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00160-fcn_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00160-fcn_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00161-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00161-fcn_indent.c
index 90342554..90342554 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00161-fcn_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00161-fcn_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00162-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00162-fcn_indent.c
index c8f152d3..c8f152d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00162-fcn_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00162-fcn_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00163-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00163-fcn_indent.c
index bbf36763..bbf36763 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00163-fcn_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00163-fcn_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00164-fcn_indent_func_def_col1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00164-fcn_indent_func_def_col1.c
index c029669a..c029669a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00164-fcn_indent_func_def_col1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00164-fcn_indent_func_def_col1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00165-sp_func_call_user_inside_fparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00165-sp_func_call_user_inside_fparen.c
index af30d708..af30d708 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00165-sp_func_call_user_inside_fparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00165-sp_func_call_user_inside_fparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00170-beautifier-off.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00170-beautifier-off.c
index 351d76ff..351d76ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00170-beautifier-off.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00170-beautifier-off.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00180-lvalue.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00180-lvalue.c
index a8121da4..a8121da4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00180-lvalue.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00180-lvalue.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00190-Issue_3559.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00190-Issue_3559.c
index a89c9d50..a89c9d50 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00190-Issue_3559.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00190-Issue_3559.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00201-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00201-case.c
index 0d004c19..0d004c19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00201-case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00201-case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00202-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00202-case.c
index d5175084..d5175084 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00202-case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00202-case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00203-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00203-case.c
index 548a2a64..548a2a64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00203-case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00203-case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00204-bug_1718.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00204-bug_1718.c
index eaddc974..eaddc974 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00204-bug_1718.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00204-bug_1718.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00205-case-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00205-case-nl_before_return.c
index b650d7ab..b650d7ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00205-case-nl_before_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00205-case-nl_before_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00206-case-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00206-case-nl_before_return.c
index d0b6bbbb..d0b6bbbb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00206-case-nl_before_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00206-case-nl_before_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00207-nl_before_ignore_after_case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00207-nl_before_ignore_after_case.c
index 4c361605..4c361605 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00207-nl_before_ignore_after_case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00207-nl_before_ignore_after_case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00301-align-struct-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00301-align-struct-init.c
index cfa44035..cfa44035 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00301-align-struct-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00301-align-struct-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00302-one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00302-one-liner-init.c
index 63c86afe..63c86afe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00302-one-liner-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00302-one-liner-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00303-one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00303-one-liner-init.c
index 503eedfb..503eedfb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00303-one-liner-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00303-one-liner-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00304-one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00304-one-liner-init.c
index 471aaa2d..471aaa2d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00304-one-liner-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00304-one-liner-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00305-one-liner-define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00305-one-liner-define.c
index 99f24f5a..99f24f5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00305-one-liner-define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00305-one-liner-define.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00310-sp_embed_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00310-sp_embed_comment.c
index 3dc105aa..3dc105aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00310-sp_embed_comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00310-sp_embed_comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00311-comment_conversion_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00311-comment_conversion_define.c
new file mode 100644
index 00000000..c52bab4f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00311-comment_conversion_define.c
@@ -0,0 +1,24 @@
+#define HDROFF_TYPE(b)      sizeof(ElfPreHeader)             /* ElfXX_Half  e_type; */
+
+typedef struct _libr_file
+{
+	unsigned int version;
+} libr_file;
+
+#define HDROFF_TYPE(b)      sizeof(    /* ElfXX_Half  e_type; */    \
+		ElfPreHeader /* ElfXX_Half  e_type; */ \
+		) /* Repeat ElfXX_Half  e_type; */
+
+// ElfXX_Half  e_shstrndx;
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS  // TEST
+
+// Do something
+void foo()
+{
+	// comment
+	int i = 0;
+}
+
+#endif
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00312-comment_conversion_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00312-comment_conversion_endif.c
new file mode 100644
index 00000000..353946fb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00312-comment_conversion_endif.c
@@ -0,0 +1,24 @@
+#ifndef DOXYGEN_SHOULD_SKIP_THIS  // TEST1
+
+void foo()
+{
+	int i = 0;
+}
+
+#elif defined(sgi) && sgi // TEST2
+
+void bar()
+{
+	int j = 0;
+}
+
+#else // TEST3
+
+void foobar()
+{
+	int j = 0;
+}
+
+#endif // END TEST
+
+void main();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00313-comment_conversion_long_lines.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00313-comment_conversion_long_lines.c
new file mode 100644
index 00000000..692533a4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00313-comment_conversion_long_lines.c
@@ -0,0 +1,16 @@
+char *libr_extract_resources(libr_file *handle)
+{
+	// If this library cannot dynamically load resources then pull out all the resources to a
+	// temporary directory
+	if(temp_folder != NULL)
+		temp_folder = strdup(temp_folder);
+
+	// If this library cannot dynamically load resources then pull out all the resources to a
+	// temporary directory
+	if(temp_folder2 != NULL)
+		temp_folder2 = strdup(temp_folder);
+
+	// If this library /*cannot dynamically load resources then pull out all the resources to a
+	// temporary directory. Repeat to make the line even longer. If this library cannot
+	// dynamically load resources then pull out all the resources to a temporary directory.
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00314-comment_conversion_javadoc_single.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00314-comment_conversion_javadoc_single.c
new file mode 100644
index 00000000..b59e2781
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00314-comment_conversion_javadoc_single.c
@@ -0,0 +1,21 @@
+// Normal comment
+
+/** Javadoc comment */
+
+/* Multiline
+* Normal
+* comment */
+
+/* Another
+   Multiline
+   Normal
+   comment
+ */
+
+/**
+ * Javadoc
+ * Multiline
+ * Normal
+ * comment
+ */
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00315-comment_conversion_trailing_c_multiline.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00315-comment_conversion_trailing_c_multiline.c
new file mode 100644
index 00000000..b61971f9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00315-comment_conversion_trailing_c_multiline.c
@@ -0,0 +1,27 @@
+typedef enum
+{
+	LIBR_ERROR_EXPANDSECTION = -20, /** Failed to set output file architecture to input file
+	                                   architecture */
+	LIBR_ERROR_OVERWRITE     = -21  /** Section already exists, over-write not specified */
+} libr_status;
+
+typedef enum
+{
+	LIBR_ERROR_EXPANDSECTION = -20, /* Failed to set output file architecture to input file
+	                                   architecture */
+	LIBR_ERROR_OVERWRITE     = -21  // Section already exists, over-write not specified
+} libr_status;
+
+typedef enum
+{
+	LIBR_ERROR_EXPANDSECTION = -20, /** Failed to set output file architecture to input file
+	                                    architecture */
+	LIBR_ERROR_OVERWRITE     = -21  // Section already exists, over-write not specified
+} libr_status;
+
+typedef enum
+{
+	LIBR_ERROR_EXPANDSECTION = -20, // Failed to set output file architecture to input file
+	                                // architecture
+	LIBR_ERROR_OVERWRITE = -21      // Section already exists, over-write not specified
+} libr_status;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00320-indent_first_bool_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00320-indent_first_bool_expr.c
index 0dcaa413..0dcaa413 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00320-indent_first_bool_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00320-indent_first_bool_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00401-align-equ.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00401-align-equ.c
index 9b213f96..9b213f96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00401-align-equ.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00401-align-equ.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00402-align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00402-align-var.c
index d7396d46..d7396d46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00402-align-var.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00402-align-var.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00403-align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00403-align-var.c
index cb62295e..cb62295e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00403-align-var.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00403-align-var.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00404-align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00404-align-var.c
index 48af3d3c..48af3d3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00404-align-var.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00404-align-var.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00405-bits.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00405-bits.c
index 9a5a6ceb..9a5a6ceb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00405-bits.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00405-bits.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00406-bug_i_771.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00406-bug_i_771.c
index 9c2b1cc2..9c2b1cc2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00406-bug_i_771.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00406-bug_i_771.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00407-star-style.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00407-star-style.c
index 156d2a27..156d2a27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00407-star-style.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00407-star-style.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00408-star-style.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00408-star-style.c
index e2e834e2..e2e834e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00408-star-style.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00408-star-style.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00409-star-style.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00409-star-style.c
index fd5e3255..fd5e3255 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00409-star-style.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00409-star-style.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00411-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00411-align-typedef.c
index 001e4a52..001e4a52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00411-align-typedef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00411-align-typedef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00412-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00412-align-typedef.c
index 001e4a52..001e4a52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00412-align-typedef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00412-align-typedef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00413-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00413-align-typedef.c
index d5f826e5..d5f826e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00413-align-typedef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00413-align-typedef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00414-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00414-align-typedef.c
index 8e63e499..8e63e499 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00414-align-typedef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00414-align-typedef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00415-align_stack.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00415-align_stack.c
index 507d6da2..507d6da2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00415-align_stack.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00415-align_stack.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00416-align_sf_call_thresh_416.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00416-align_sf_call_thresh_416.c
index 36fbca84..36fbca84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00416-align_sf_call_thresh_416.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00416-align_sf_call_thresh_416.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00417-align_sf_call_thresh_417.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00417-align_sf_call_thresh_417.c
index 3047b932..3047b932 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00417-align_sf_call_thresh_417.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00417-align_sf_call_thresh_417.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00418-align_sf_call_span_418.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00418-align_sf_call_span_418.c
index 82444a2b..82444a2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00418-align_sf_call_span_418.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00418-align_sf_call_span_418.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00419-align_sf_call_span_419.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00419-align_sf_call_span_419.c
index 20b9705a..20b9705a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00419-align_sf_call_span_419.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00419-align_sf_call_span_419.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00420-Issue-2278.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00420-Issue_2278.c
index 2bab88ab..2bab88ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00420-Issue-2278.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00420-Issue_2278.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00421-nl_ds_struct_enum.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00421-nl_ds_struct_enum.c
index ec5bcc31..ec5bcc31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00421-nl_ds_struct_enum.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00421-nl_ds_struct_enum.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00422-nl_ds_struct_enum.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00422-nl_ds_struct_enum.c
index d45b2add..d45b2add 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00422-nl_ds_struct_enum.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00422-nl_ds_struct_enum.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00423-bug_1702.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00423-bug_1702.c
index bf74c8bd..bf74c8bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00423-bug_1702.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00423-bug_1702.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00424-Issue_3506.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00424-Issue_3506.c
index c3cdd0f8..c3cdd0f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00424-Issue_3506.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00424-Issue_3506.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00430-paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00430-paren-indent.c
index f6b148ce..f6b148ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00430-paren-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00430-paren-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00431-paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00431-paren-indent.c
index 51a80854..51a80854 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00431-paren-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00431-paren-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00432-paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00432-paren-indent.c
index 9ab77831..9ab77831 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00432-paren-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00432-paren-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00440-bug_489.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00440-bug_489.c
index 47a5da06..47a5da06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00440-bug_489.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00440-bug_489.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00451-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00451-enum_gallery.c
index 3cb8db3c..3cb8db3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00451-enum_gallery.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00451-enum_gallery.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00452-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00452-enum_gallery.c
index cb235c3d..cb235c3d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00452-enum_gallery.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00452-enum_gallery.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00453-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00453-enum_gallery.c
index af537d1d..af537d1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00453-enum_gallery.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00453-enum_gallery.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00453-enum_gallery.rerun.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00453-enum_gallery.rerun.c
index 148f1970..148f1970 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00453-enum_gallery.rerun.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00453-enum_gallery.rerun.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00454-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00454-enum_gallery.c
index 8d00cbce..8d00cbce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00454-enum_gallery.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00454-enum_gallery.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00461-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00461-align_func_proto_star_amp.h
index 5b0490c8..5b0490c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00461-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00461-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00462-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00462-align_func_proto_star_amp.h
index c05fc454..c05fc454 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00462-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00462-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00463-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00463-align_func_proto_star_amp.h
index 702b9396..702b9396 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00463-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00463-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00464-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00464-align_func_proto_star_amp.h
index f1f927dc..f1f927dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00464-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00464-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00465-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00465-align_func_proto_star_amp.h
index 9bd55a23..9bd55a23 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00465-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00465-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00466-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00466-align_func_proto_star_amp.h
index b91044f7..b91044f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00466-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00466-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00467-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00467-align_func_proto_star_amp.h
index e87c4cd8..e87c4cd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00467-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00467-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00468-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00468-align_func_proto_star_amp.h
index 0fb8eacb..0fb8eacb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00468-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00468-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00469-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00469-align_func_proto_star_amp.h
index 5f776985..5f776985 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00469-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00469-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00470-align_trailing_do_cmt.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00470-align_trailing_do_cmt.c
index 7c21b3d9..7c21b3d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00470-align_trailing_do_cmt.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00470-align_trailing_do_cmt.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00501-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00501-bool-pos.c
index b9d537a1..b9d537a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00501-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00501-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00502-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00502-bool-pos.c
index 7890fcd7..7890fcd7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00502-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00502-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00503-pos_compare.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00503-pos_compare.c
index cc809a09..cc809a09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00503-pos_compare.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00503-pos_compare.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00504-pos_compare.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00504-pos_compare.c
index fe16e10e..fe16e10e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00504-pos_compare.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00504-pos_compare.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00505-pos_conditional.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00505-pos_conditional.c
index 91f17d57..91f17d57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00505-pos_conditional.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00505-pos_conditional.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00506-pos_conditional.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00506-pos_conditional.c
index 23945656..23945656 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00506-pos_conditional.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00506-pos_conditional.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00510-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00510-bool-pos.c
index 5958e3c5..5958e3c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00510-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00510-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00511-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00511-bool-pos.c
index 8f6effd8..8f6effd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00511-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00511-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00512-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00512-bool-pos.c
index 2e82b7ef..2e82b7ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00512-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00512-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00513-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00513-bool-pos.c
index cad844c5..cad844c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00513-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00513-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00514-my_infile.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00514-my_infile.c
index 3f4c76fb..3f4c76fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00514-my_infile.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00514-my_infile.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00600-dos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00600-dos.c
index a0482ba3..a0482ba3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00600-dos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00600-dos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00601-mac.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00601-mac.c
index 2be04c61..2be04c61 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00601-mac.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00601-mac.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00611-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00611-pp-space.c
index 217fc89a..217fc89a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00611-pp-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00611-pp-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00612-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00612-pp-space.c
index 7c19bf1e..7c19bf1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00612-pp-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00612-pp-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00613-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00613-pp-space.c
index 7092a193..7092a193 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00613-pp-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00613-pp-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00614-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00614-pp-space.c
index 103c2ca4..103c2ca4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00614-pp-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00614-pp-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00615-pp-nest.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00615-pp-nest.c
index 5e99a1d0..5e99a1d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00615-pp-nest.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00615-pp-nest.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00616-pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00616-pp-if-indent.c
index dc2dea10..dc2dea10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00616-pp-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00616-pp-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00617-pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00617-pp-if-indent.c
index 2caf73d2..2caf73d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00617-pp-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00617-pp-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00618-pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00618-pp-if-indent.c
index f7b3d270..f7b3d270 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00618-pp-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00618-pp-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00619-Issue_3169.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00619-Issue_3169.c
index 848e451e..848e451e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00619-Issue_3169.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00619-Issue_3169.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00620-indent-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00620-indent-assign.c
index c01e146a..c01e146a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00620-indent-assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00620-indent-assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00621-nl_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00621-nl_endif.c
index bae6272c..bae6272c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00621-nl_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00621-nl_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00622-indent-off-after-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00622-indent-off-after-assign.c
index eb083f7b..eb083f7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00622-indent-off-after-assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00622-indent-off-after-assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00623-pp_space_before_after.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00623-pp_space_before_after.c
index 4b390a51..4b390a51 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00623-pp_space_before_after.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00623-pp_space_before_after.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00624-pp_space_before_after.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00624-pp_space_before_after.c
index 06aee282..06aee282 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00624-pp_space_before_after.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00624-pp_space_before_after.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00625-pp_space_before_after.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00625-pp_space_before_after.c
index 0b37952e..0b37952e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00625-pp_space_before_after.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00625-pp_space_before_after.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00626-pp_space_before_after.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00626-pp_space_before_after.c
index ce21809e..ce21809e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00626-pp_space_before_after.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00626-pp_space_before_after.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00631-nl_assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00631-nl_assign.c
index 7319d498..7319d498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00631-nl_assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00631-nl_assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00632-nl_assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00632-nl_assign.c
index 2452e773..2452e773 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00632-nl_assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00632-nl_assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00633-bug_3156.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00633-bug_3156.c
index 508a0098..508a0098 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00633-bug_3156.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00633-bug_3156.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00701-function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00701-function-def.c
index 6f0133e8..6f0133e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00701-function-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00701-function-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00702-function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00702-function-def.c
index eaa568da..eaa568da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00702-function-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00702-function-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00703-function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00703-function-def.c
index 76cf664f..76cf664f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00703-function-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00703-function-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00710-add_long_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00710-add_long_comment.c
index 82bf680e..82bf680e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00710-add_long_comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00710-add_long_comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00721-nl-semicolon.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00721-nl-semicolon.c
index 441091b5..441091b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00721-nl-semicolon.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00721-nl-semicolon.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00730-nl_func_call.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00730-nl_func_call.c
index 38c17e45..38c17e45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00730-nl_func_call.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00730-nl_func_call.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00731-nl_func_call.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00731-nl_func_call.c
index 38c17e45..38c17e45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00731-nl_func_call.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00731-nl_func_call.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00732-nl_func_call.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00732-nl_func_call.c
index b57470e8..b57470e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00732-nl_func_call.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00732-nl_func_call.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00733-nl_func_call.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00733-nl_func_call.c
index 2290132d..2290132d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00733-nl_func_call.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00733-nl_func_call.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00734-nl_func_call.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00734-nl_func_call.c
index 8233b0ec..8233b0ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00734-nl_func_call.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00734-nl_func_call.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00801-fcn_type.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00801-fcn_type.c
index 72af3fa3..72af3fa3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00801-fcn_type.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00801-fcn_type.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00802-funcfunc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00802-funcfunc.c
index 4d0f0432..4d0f0432 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00802-funcfunc.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00802-funcfunc.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00803-fcn_type.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00803-fcn_type.c
index 9e1e5c55..9e1e5c55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00803-fcn_type.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00803-fcn_type.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00901-code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00901-code_width.c
index 6c2a99c7..16fba398 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00901-code_width.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00901-code_width.c
@@ -19,9 +19,10 @@ static int short_function_name(struct device *dev,
         some_long_parameter1,
         some_long_parameter2);
 
-    abc = call_some_other_really_long_function.of_some_sort(
-        some_long_parameter1,
-        some_long_parameter2);
+    abc =
+        call_some_other_really_long_function.of_some_sort(
+            some_long_parameter1,
+            some_long_parameter2);
 
     abc.def.ghi =
         call_some_other_really_long_function.of_some_sort(
@@ -38,10 +39,9 @@ typedef
     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
     yyyyyyyyyyyyyyyyyyyyyy;
 
-typedef some_return_value (*some_function_type)(another_type
-                                                parameter1,
-                                                another_type
-                                                parameter2);
+typedef some_return_value (*some_function_type)(
+    another_type parameter1,
+    another_type parameter2);
 
 typedef struct
     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -53,8 +53,9 @@ static void some_really_long_function_name(
     struct device *dev,
     struct device_driver *drv)
 {
-    if ((some_variable_name &&
-         somefunction(param1, param2, param3))) {
+    if ((some_variable_name && somefunction(param1,
+                                            param2,
+                                            param3))) {
         asdfghjk = asdfasdfasd.aasdfasd +
                    (asdfasd.asdas * 1234.65);
     }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00902-code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00902-code_width.c
index be2e42f4..66565c55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00902-code_width.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00902-code_width.c
@@ -14,8 +14,9 @@ static int short_function_name(struct device *dev,
     call_some_really_long_function.of_some_sort(
         some_long_parameter1, some_long_parameter2);
 
-    abc = call_some_other_really_long_function.of_some_sort(
-        some_long_parameter1, some_long_parameter2);
+    abc =
+        call_some_other_really_long_function.of_some_sort(
+            some_long_parameter1, some_long_parameter2);
 
     abc.def.ghi =
         call_some_other_really_long_function.of_some_sort(
@@ -31,10 +32,8 @@ typedef
     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
     yyyyyyyyyyyyyyyyyyyyyy;
 
-typedef some_return_value (*some_function_type)(another_type
-                                                parameter1,
-                                                another_type
-                                                parameter2);
+typedef some_return_value (*some_function_type)(
+    another_type parameter1, another_type parameter2);
 
 typedef struct
     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -45,8 +44,8 @@ typedef struct
 static void some_really_long_function_name(
     struct device *dev, struct device_driver *drv)
 {
-    if ((some_variable_name &&
-         somefunction(param1, param2, param3))) {
+    if ((some_variable_name && somefunction(param1, param2,
+                                            param3))) {
         asdfghjk = asdfasdfasd.aasdfasd +
                    (asdfasd.asdas * 1234.65);
     }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00903-code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00903-code_width.c
index 70b3a113..7349bde3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00903-code_width.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00903-code_width.c
@@ -16,13 +16,13 @@ static int short_function_name(struct device *dev, struct device_driver *drv)
     call_some_really_long_function.of_some_sort(some_long_parameter1,
                                                 some_long_parameter2);
 
-    abc = call_some_other_really_long_function.of_some_sort(
-        some_long_parameter1,
-        some_long_parameter2);
+    abc =
+        call_some_other_really_long_function.of_some_sort(some_long_parameter1,
+                                                          some_long_parameter2);
 
-    abc.def.ghi = call_some_other_really_long_function.of_some_sort(
-        some_long_parameter1,
-        some_long_parameter2);
+    abc.def.ghi =
+        call_some_other_really_long_function.of_some_sort(some_long_parameter1,
+                                                          some_long_parameter2);
 
     abcdefghijklmnopqrstuvwxyz = abc + def + ghi + jkl + mno + prq + stu + vwx +
                                  yz;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00910-pascal_ptr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00910-pascal_ptr.c
index 27a9cdef..27a9cdef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00910-pascal_ptr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00910-pascal_ptr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00911-pascal_ptr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00911-pascal_ptr.c
index 4c0d0dde..4c0d0dde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/00911-pascal_ptr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/00911-pascal_ptr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01000-mod-paren.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01000-mod-paren.c
index ca919f77..ca919f77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01000-mod-paren.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01000-mod-paren.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01001-nl-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01001-nl-comment.c
index ecac3e2a..ecac3e2a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01001-nl-comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01001-nl-comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01002-mod-paren.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01002-mod-paren.c
index 2537330f..2537330f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01002-mod-paren.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01002-mod-paren.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01005-mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01005-mod_case_brace.c
index caeae178..caeae178 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01005-mod_case_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01005-mod_case_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01006-mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01006-mod_case_brace.c
index 371bd5cb..371bd5cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01006-mod_case_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01006-mod_case_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01007-mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01007-mod_case_brace.c
index 2ea3dea5..2ea3dea5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01007-mod_case_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01007-mod_case_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01008-Issue_3366.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01008-Issue_3366.c
index 75a95e36..75a95e36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01008-Issue_3366.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01008-Issue_3366.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01009-mod_move_case_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01009-mod_move_case_return.c
index 484b4c33..484b4c33 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01009-mod_move_case_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01009-mod_move_case_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01010-mod_move_case_return_bad.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01010-mod_move_case_return_bad.c
index c6fa63e8..c6fa63e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01010-mod_move_case_return_bad.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01010-mod_move_case_return_bad.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01011-semicolons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01011-semicolons.c
index 962ec588..962ec588 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01011-semicolons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01011-semicolons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01012-semicolons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01012-semicolons.c
index 54d895e7..54d895e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01012-semicolons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01012-semicolons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01015-paren_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01015-paren_indent.c
index d993315c..d993315c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01015-paren_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01015-paren_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01016-align_attr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01016-align_attr.c
index 012217e4..012217e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01016-align_attr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01016-align_attr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01020-kw_subst.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01020-kw_subst.c
index 61b43c3f..61b43c3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01020-kw_subst.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01020-kw_subst.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01021-hello.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01021-hello.c
index 6ba46ef7..6ba46ef7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01021-hello.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01021-hello.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01022-kw_subst.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01022-kw_subst.c
index 6cba8370..6cba8370 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01022-kw_subst.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01022-kw_subst.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01030-multi.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01030-multi.h
index 14a599c7..14a599c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01030-multi.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01030-multi.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01035-func_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01035-func_wrap.c
index b2f86805..b2f86805 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01035-func_wrap.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01035-func_wrap.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01036-func_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01036-func_wrap.c
index 24e932ed..24e932ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01036-func_wrap.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01036-func_wrap.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01037-type_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01037-type_wrap.c
index c3c23569..c3c23569 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01037-type_wrap.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01037-type_wrap.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01040-newline_after_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01040-newline_after_endif.c
index 2a0cbe62..2a0cbe62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01040-newline_after_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01040-newline_after_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01050-func_call_user.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01050-func_call_user.c
index 82eba7cb..82eba7cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01050-func_call_user.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01050-func_call_user.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01060-backslash-newline-lex.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01060-backslash-newline-lex.c
index f5000b82..f5000b82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01060-backslash-newline-lex.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01060-backslash-newline-lex.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01070-various_colons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01070-various_colons.c
index 0850b17e..0850b17e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01070-various_colons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01070-various_colons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01071-various_colons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01071-various_colons.c
index e25134ab..e25134ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01071-various_colons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01071-various_colons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01080-bug_1196.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01080-bug_1196.c
index 9fdabca6..9fdabca6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/01080-bug_1196.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/01080-bug_1196.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02000-i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02000-i2c-core.c
index 528a6161..528a6161 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02000-i2c-core.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02000-i2c-core.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02001-directfb.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02001-directfb.h
index 3c7ffc18..3c7ffc18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02001-directfb.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02001-directfb.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02002-i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02002-i2c-core.c
index 698df2a6..698df2a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02002-i2c-core.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02002-i2c-core.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02003-Issue_3353.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02003-Issue_3353.h
index f189ebfa..f189ebfa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02003-Issue_3353.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02003-Issue_3353.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02100-i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02100-i2c-core.c
index df01ad5b..df01ad5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02100-i2c-core.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02100-i2c-core.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02101-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02101-comment-indent.c
index 7c5f0f0c..7c5f0f0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02101-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02101-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02200-xml.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02200-xml.c
index 62bd81d0..62bd81d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02200-xml.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02200-xml.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02201-align-string.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02201-align-string.c
index 0b2cf25a..0b2cf25a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02201-align-string.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02201-align-string.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02300-preproc-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02300-preproc-if.c
index 8e20a744..8e20a744 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02300-preproc-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02300-preproc-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02301-preproc-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02301-preproc-if.c
index 0130e1f5..0130e1f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02301-preproc-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02301-preproc-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02302-nl-cont.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02302-nl-cont.c
index dfbb0c2d..93483d35 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02302-nl-cont.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02302-nl-cont.c
@@ -1,6 +1,6 @@
 

-#define FOO(bar) create_a_really_long_identifier name(some_function( \

-                                                          bar1 + bar2), bar3, \

+#define FOO(bar) create_a_really_long_identifier name(some_function(bar1 + \

+                                                                    bar2), bar3, \

                                                       bar4);

 

 #define VNV_RECORD_CYCLES(m) do { \

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02303-nl-cont2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02303-nl-cont2.c
index a0129423..853376b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02303-nl-cont2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02303-nl-cont2.c
@@ -1,6 +1,6 @@
 

-#define FOO(bar) create_a_really_long_identifier name(some_function( \

-                                                          bar1 + bar2), bar3, \

+#define FOO(bar) create_a_really_long_identifier name(some_function(bar1 + \

+                                                                    bar2), bar3, \

                                                       bar4);

 

 #define multilinemacro do { (x+5); } while (0); \

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02310-empty-for.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02310-empty-for.c
index 4bd43b09..4bd43b09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02310-empty-for.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02310-empty-for.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02311-pragma.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02311-pragma.c
index ec944697..ec944697 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02311-pragma.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02311-pragma.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02315-pp_ret.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02315-pp_ret.c
index 18a3d5cb..18a3d5cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02315-pp_ret.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02315-pp_ret.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02320-nl_create_one_liner.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02320-nl_create_one_liner.c
index 55974c3c..55974c3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02320-nl_create_one_liner.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02320-nl_create_one_liner.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02325-sort_include.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02325-sort_include.c
index 4f2b20bf..4f2b20bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02325-sort_include.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02325-sort_include.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02330-one_liners.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02330-one_liners.c
index 57d8ba44..57d8ba44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02330-one_liners.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02330-one_liners.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02410-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02410-ifdef-indent.c
index e71d8cf3..e71d8cf3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02410-ifdef-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02410-ifdef-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02411-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02411-ifdef-indent.c
index bf39a98c..bf39a98c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02411-ifdef-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02411-ifdef-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02412-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02412-ifdef-indent.c
index 23b4dd37..23b4dd37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02412-ifdef-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02412-ifdef-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02413-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02413-ifdef-indent.c
index 8738bbf7..8738bbf7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02413-ifdef-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02413-ifdef-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02414-whole_file_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02414-whole_file_ifdef.c
index c767bbf7..c767bbf7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02414-whole_file_ifdef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02414-whole_file_ifdef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02415-endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02415-endif.c
index c8b99a6a..c8b99a6a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02415-endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02415-endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02416-cmt_nl_end.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02416-cmt_nl_end.c
index 56de21ec..56de21ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02416-cmt_nl_end.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02416-cmt_nl_end.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02421-cmt_multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02421-cmt_multi.c
index 61faac36..61faac36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02421-cmt_multi.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02421-cmt_multi.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02422-cmt_multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02422-cmt_multi.c
index bbdd79cd..bbdd79cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02422-cmt_multi.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02422-cmt_multi.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02423-cmt_multi_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02423-cmt_multi_utf8.c
index 05b01f84..05b01f84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02423-cmt_multi_utf8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02423-cmt_multi_utf8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02431-cmt_right_align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02431-cmt_right_align.c
index 315e5010..315e5010 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02431-cmt_right_align.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02431-cmt_right_align.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02432-cmt_right_align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02432-cmt_right_align.c
index eef43777..eef43777 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02432-cmt_right_align.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02432-cmt_right_align.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02440-string_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02440-string_utf8.c
index a473e1bf..a473e1bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02440-string_utf8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02440-string_utf8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02441-utf8-identifiers.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02441-utf8-identifiers.c
index 1dc39e9c..1dc39e9c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02441-utf8-identifiers.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02441-utf8-identifiers.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02451-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02451-nl_return_expr.c
index bf8621d5..bf8621d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02451-nl_return_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02451-nl_return_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02452-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02452-nl_return_expr.c
index 4dc23adf..4dc23adf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02452-nl_return_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02452-nl_return_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02453-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02453-nl_return_expr.c
index c917fb17..c917fb17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02453-nl_return_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02453-nl_return_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02454-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02454-nl_return_expr.c
index 2e33d2b0..2e33d2b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02454-nl_return_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02454-nl_return_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02455-macro-returns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02455-macro-returns.c
index f85a1663..f85a1663 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02455-macro-returns.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02455-macro-returns.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02456-macro-returns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02456-macro-returns.c
index 973fdfca..973fdfca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02456-macro-returns.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02456-macro-returns.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02457-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02457-nl_before_return.c
index a396202f..a396202f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02457-nl_before_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02457-nl_before_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02460-freebsd.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02460-freebsd.c
index c0af0657..c0af0657 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02460-freebsd.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02460-freebsd.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02486-doxy-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02486-doxy-comment.c
index e2a6c2c4..e2a6c2c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02486-doxy-comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02486-doxy-comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02487-doxy-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02487-doxy-comment.c
index 5049dada..5049dada 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02487-doxy-comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02487-doxy-comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02501-custom_types_ssl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02501-custom_types_ssl.c
index 3e28d2e3..3e28d2e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02501-custom_types_ssl.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02501-custom_types_ssl.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02502-custom_types_ssl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02502-custom_types_ssl.c
index 0df5ddad..0df5ddad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02502-custom_types_ssl.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02502-custom_types_ssl.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02504-align_keep_extra.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02504-align_keep_extra.c
index 985f428c..985f428c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02504-align_keep_extra.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02504-align_keep_extra.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02505-align_assigns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02505-align_assigns.c
index dadef510..dadef510 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02505-align_assigns.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02505-align_assigns.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02506-align_assign_var_defs.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02506-align_assign_var_defs.c
index 682982ee..682982ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02506-align_assign_var_defs.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02506-align_assign_var_defs.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02510-asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02510-asm.c
index 6609bf9b..6609bf9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02510-asm.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02510-asm.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02520-pp_indent_with_tabs.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02520-pp_indent_with_tabs.c
index 18596a65..18596a65 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02520-pp_indent_with_tabs.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02520-pp_indent_with_tabs.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02521-pp_indent_with_tabs.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02521-pp_indent_with_tabs.c
index dbf66a9e..dbf66a9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02521-pp_indent_with_tabs.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02521-pp_indent_with_tabs.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02522-pp_indent_with_tabs.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02522-pp_indent_with_tabs.c
index dbf66a9e..dbf66a9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02522-pp_indent_with_tabs.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02522-pp_indent_with_tabs.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02523-pp_indent_with_tabs.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02523-pp_indent_with_tabs.c
index 85cee37d..85cee37d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02523-pp_indent_with_tabs.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02523-pp_indent_with_tabs.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02524-pp_indent_with_tabs.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02524-pp_indent_with_tabs.c
index dbf66a9e..dbf66a9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02524-pp_indent_with_tabs.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02524-pp_indent_with_tabs.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02525-pp_indent_with_tabs.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02525-pp_indent_with_tabs.c
index dbf66a9e..dbf66a9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02525-pp_indent_with_tabs.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02525-pp_indent_with_tabs.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02530-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02530-pp_multiline_define.c
index 24b840f3..b452bae0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02530-pp_multiline_define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02530-pp_multiline_define.c
@@ -1,5 +1,8 @@
 #define gettext(Msgid) \
 	QWERTY0 Msgid;
+#define farright(Msgid)       \
+                                        \
+	QWERTY0 Msgid;
 #ifdef TEST
 #define gettext1(Msgid) \
 	if (true) \
@@ -56,7 +59,7 @@ void f()
 		QWERTY1 Msgid; \
 		do \
 		{       \
-			if (false) { \
+			if (false){ \
 				g = g + 1; \
 			} \
 		}                   \
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02531-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02531-pp_multiline_define.c
index b73bb9af..06a234ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02531-pp_multiline_define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02531-pp_multiline_define.c
@@ -1,5 +1,8 @@
 #define gettext(Msgid) \
 	QWERTY0 Msgid;
+#define farright(Msgid)       \
+                                        \
+	QWERTY0 Msgid;
 #ifdef TEST
 #define gettext1(Msgid) \
 	if (true) \
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02532-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02532-pp_multiline_define.c
index 780d71e1..e6a27632 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02532-pp_multiline_define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02532-pp_multiline_define.c
@@ -1,5 +1,8 @@
 #define gettext(Msgid) \
     QWERTY0 Msgid;
+#define farright(Msgid)       \
+                                        \
+    QWERTY0 Msgid;
 #ifdef TEST
 #define gettext1(Msgid) \
   if (true) \
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02533-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02533-pp_multiline_define.c
index 088418e7..90b4b74f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02533-pp_multiline_define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02533-pp_multiline_define.c
@@ -1,5 +1,8 @@
 #define gettext(Msgid) \
         QWERTY0 Msgid;
+#define farright(Msgid)       \
+                                        \
+        QWERTY0 Msgid;
 #ifdef TEST
 #define gettext1(Msgid) \
         if (true) \
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02534-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02534-pp_multiline_define.c
index 81837e7c..2d498e9f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02534-pp_multiline_define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02534-pp_multiline_define.c
@@ -1,5 +1,8 @@
 #define gettext(Msgid) \
         QWERTY0 Msgid;
+#define farright(Msgid) \
+                        \
+        QWERTY0 Msgid;
 #ifdef TEST
 #define gettext1(Msgid)  \
         if (true)        \
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02535-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02535-pp_multiline_define.c
index 04375283..1b728e0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02535-pp_multiline_define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02535-pp_multiline_define.c
@@ -1,5 +1,8 @@
 #define gettext(Msgid) \
         QWERTY0 Msgid;
+#define farright(Msgid) \
+                        \
+        QWERTY0 Msgid;
 #ifdef TEST
 #define gettext1(Msgid)  \
         if (true)        \
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02536-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02536-pp_multiline_define.c
index 490510ac..9a0d2a95 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02536-pp_multiline_define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02536-pp_multiline_define.c
@@ -1,5 +1,8 @@
 #define gettext(Msgid) \
         QWERTY0 Msgid;
+#define farright(Msgid) \
+                        \
+        QWERTY0 Msgid;
 #ifdef TEST
    #define gettext1(Msgid)  \
            if (true)        \
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02537-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02537-pp_multiline_define.c
index 9cca3cc8..0b0034f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02537-pp_multiline_define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02537-pp_multiline_define.c
@@ -1,5 +1,8 @@
 #define gettext(Msgid) \
     QWERTY0 Msgid;
+#define farright(Msgid) \
+                        \
+    QWERTY0 Msgid;
 #ifdef TEST
   #define gettext1(Msgid) \
       if (true)           \
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02538-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02538-pp_multiline_define.c
index 649c473e..687099af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02538-pp_multiline_define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02538-pp_multiline_define.c
@@ -1,5 +1,8 @@
 #define gettext(Msgid) \
   QWERTY0 Msgid;
+#define farright(Msgid) \
+                        \
+  QWERTY0 Msgid;
 #ifdef TEST
   #define gettext1(Msgid) \
     if (true)             \
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02539-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02539-pp_multiline_define.c
index e437aa73..d4b95681 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02539-pp_multiline_define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02539-pp_multiline_define.c
@@ -1,5 +1,8 @@
 #define gettext(Msgid) \
 QWERTY0 Msgid;
+#define farright(Msgid) \
+                        \
+QWERTY0 Msgid;
 #ifdef TEST
   #define gettext1(Msgid) \
   if (true)               \
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02540-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02540-pp_multiline_define.c
index ab382e23..8081e80d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02540-pp_multiline_define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02540-pp_multiline_define.c
@@ -1,5 +1,8 @@
 #define gettext(Msgid) \
 QWERTY0 Msgid;
+#define farright(Msgid) \
+                        \
+QWERTY0 Msgid;
 #ifdef TEST
   #define gettext1(Msgid) \
 if (true)                 \
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02541-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02541-pp_multiline_define.c
index 37db1457..2140aa87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02541-pp_multiline_define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02541-pp_multiline_define.c
@@ -1,5 +1,8 @@
 #define gettext(Msgid) \
     QWERTY0 Msgid;
+#define farright(Msgid) \
+                        \
+    QWERTY0 Msgid;
 #ifdef TEST
   #define gettext1(Msgid) \
     if (true)             \
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02542-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02542-pp_multiline_define.c
new file mode 100644
index 00000000..3872ba29
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02542-pp_multiline_define.c
@@ -0,0 +1,71 @@
+#define gettext(Msgid) \
+	QWERTY0 Msgid;
+#define farright(Msgid)       \
+                              \
+	QWERTY0 Msgid;
+#ifdef TEST
+#define gettext1(Msgid)        \
+	if (true)              \
+	{                      \
+		QWERTY1 Msgid; \
+	}                      \
+	while(true)            \
+	{                      \
+		g = g + 1;     \
+	}
+int i = 3;
+
+#define x                      \
+	(                      \
+		x              \
+	)                      \
+	{                      \
+		QWERTY2 Msgid; \
+	}
+void f()
+{
+	int i=2;
+}
+#endif
+
+#pragma multi \
+	line  \
+	pragma
+
+    #define setint(x) x = x + 1
+#define K 2
+		 #define gettext2(Msgid)            \
+			 if (true)                  \
+			 {                          \
+				 QWERTY1 Msgid;     \
+				 do                 \
+				 {                  \
+					 g = g + 1; \
+				 }                  \
+				 while(true);       \
+			 }
+
+#warning multi \
+	line   \
+	warning
+
+#ifdef TEST1
+	       #ifdef TEST2
+#ifdef TEST3
+     #ifdef TEST4
+#define gettext1(Msgid)                    \
+	if (true)                          \
+	{                                  \
+		QWERTY1 Msgid;             \
+		do                         \
+		{                          \
+			if (false){        \
+				g = g + 1; \
+			}                  \
+		}                          \
+		while(true);               \
+	}
+#endif
+   #endif
+	 #endif
+      #endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02543-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02543-pp_multiline_define.c
new file mode 100644
index 00000000..b15a5923
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02543-pp_multiline_define.c
@@ -0,0 +1,71 @@
+#define gettext(Msgid) \
+	QWERTY0 Msgid;
+#define farright(Msgid)                 \
+                                        \
+	QWERTY0 Msgid;
+#ifdef TEST
+#define gettext1(Msgid)        \
+	if (true)              \
+	{                      \
+		QWERTY1 Msgid; \
+	}                      \
+	while(true)            \
+	{                      \
+		g = g + 1;     \
+	}
+int i = 3;
+
+#define x                      \
+	(                      \
+		x              \
+	)                      \
+	{                      \
+		QWERTY2 Msgid; \
+	}
+void f()
+{
+	int i=2;
+}
+#endif
+
+#pragma multi \
+	line  \
+	pragma
+
+    #define setint(x) x = x + 1
+#define K 2
+		 #define gettext2(Msgid)              \
+			 if (true)                    \
+			 {                            \
+				 QWERTY1 Msgid;       \
+				 do                   \
+				 {                    \
+					 g = g + 1;   \
+				 }                    \
+				 while(true);         \
+			 }
+
+#warning multi \
+	line   \
+	warning
+
+#ifdef TEST1
+	       #ifdef TEST2
+#ifdef TEST3
+     #ifdef TEST4
+#define gettext1(Msgid)                    \
+	if (true)                          \
+	{                                  \
+		QWERTY1 Msgid;             \
+		do                         \
+		{                          \
+			if (false){        \
+				g = g + 1; \
+			}                  \
+		}                          \
+		while(true);               \
+	}
+#endif
+   #endif
+	 #endif
+      #endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02544-pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02544-pp_multiline_define.c
new file mode 100644
index 00000000..b221802e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02544-pp_multiline_define.c
@@ -0,0 +1,71 @@
+#define gettext(Msgid)     \
+	QWERTY0 Msgid;
+#define farright(Msgid)     \
+                            \
+	QWERTY0 Msgid;
+#ifdef TEST
+#define gettext1(Msgid)            \
+	if (true)                  \
+	{                          \
+		QWERTY1 Msgid;     \
+	}                          \
+	while(true)                \
+	{                          \
+		g = g + 1;         \
+	}
+int i = 3;
+
+#define x                          \
+	(                          \
+		x                  \
+	)                          \
+	{                          \
+		QWERTY2 Msgid;     \
+	}
+void f()
+{
+	int i=2;
+}
+#endif
+
+#pragma multi     \
+	line      \
+	pragma
+
+    #define setint(x) x = x + 1
+#define K 2
+		 #define gettext2(Msgid)                \
+			 if (true)                      \
+			 {                              \
+				 QWERTY1 Msgid;         \
+				 do                     \
+				 {                      \
+					 g = g + 1;     \
+				 }                      \
+				 while(true);           \
+			 }
+
+#warning multi     \
+	line       \
+	warning
+
+#ifdef TEST1
+	       #ifdef TEST2
+#ifdef TEST3
+     #ifdef TEST4
+#define gettext1(Msgid)                        \
+	if (true)                              \
+	{                                      \
+		QWERTY1 Msgid;                 \
+		do                             \
+		{                              \
+			if (false){            \
+				g = g + 1;     \
+			}                      \
+		}                              \
+		while(true);                   \
+	}
+#endif
+   #endif
+	 #endif
+      #endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02550-func_var_multi_paren.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02550-func_var_multi_paren.c
index aefbde49..aefbde49 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/02550-func_var_multi_paren.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/02550-func_var_multi_paren.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/07630-indent-vbrace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/07630-indent-vbrace.c
index a1344348..a1344348 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/07630-indent-vbrace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/07630-indent-vbrace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/08399-gh399.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/08399-gh399.c
index 780234ab..780234ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/08399-gh399.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/08399-gh399.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09588-sf588.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09588-sf588.c
index d1c5f1cc..d1c5f1cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09588-sf588.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09588-sf588.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09594-sf594.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09594-sf594.c
index 94a1973c..94a1973c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09594-sf594.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09594-sf594.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09601-sp_after_sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09601-bug_637.c
index 93cbfea2..93cbfea2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09601-sp_after_sparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09601-bug_637.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09602-bug_671.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09602-bug_671.c
index a9d54ee8..a9d54ee8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09602-bug_671.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09602-bug_671.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09603-indent_ternary-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09603-indent_ternary-1.c
index f9200886..f9200886 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09603-indent_ternary-1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09603-indent_ternary-1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09604-indent_ternary-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09604-indent_ternary-2.c
index e6d3576c..e6d3576c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09604-indent_ternary-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09604-indent_ternary-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09605-negative_value.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09605-negative_value.c
index 6399fbef..6399fbef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09605-negative_value.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09605-negative_value.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09606-extern.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09606-extern.c
index d43131fe..d43131fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09606-extern.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09606-extern.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09607-attribute.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09607-attribute.c
index 19e3a057..19e3a057 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09607-attribute.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09607-attribute.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09608-func_call_user2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09608-func_call_user2.c
index ee4e24d4..ee4e24d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09608-func_call_user2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09608-func_call_user2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09609-Issue_2279.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09609-Issue_2279.c
index 88c0ae84..88c0ae84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09609-Issue_2279.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09609-Issue_2279.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09610-bug_i_876.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09610-bug_i_876.c
index e1afece6..e1afece6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09610-bug_i_876.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09610-bug_i_876.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09611-bug_i_222.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09611-bug_i_222.c
index 4f0ded31..4f0ded31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09611-bug_i_222.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09611-bug_i_222.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09612-bug_1041.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09612-bug_1041.c
index 7c07615b..7c07615b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09612-bug_1041.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09612-bug_1041.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09613-i1413.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09613-i1413.c
index 4287ca86..4287ca86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09613-i1413.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09613-i1413.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09614-string_prefixes.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09614-string_prefixes.c
index e901c9ac..e901c9ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09614-string_prefixes.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09614-string_prefixes.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09615-i1564.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09615-i1564.c
index 2b37b25c..2b37b25c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09615-i1564.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09615-i1564.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09616-enum_comma_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09616-enum_comma_ifdef.c
index 95637aae..95637aae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09616-enum_comma_ifdef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09616-enum_comma_ifdef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09617-Issue_2360.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09617-Issue_2360.c
index 0489b0f9..0489b0f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09617-Issue_2360.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09617-Issue_2360.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09618-Issue_2360.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09618-Issue_2360.c
index 898c64e6..898c64e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09618-Issue_2360.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09618-Issue_2360.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09619-Issue_2411.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09619-Issue_2411.c
index 40244488..40244488 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09619-Issue_2411.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09619-Issue_2411.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09620-Issue_2640.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09620-Issue_2640.c
index ba25bcbe..ba25bcbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09620-Issue_2640.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09620-Issue_2640.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09621-pp-before-func-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09621-pp-before-func-def.c
index 948ce135..948ce135 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09621-pp-before-func-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09621-pp-before-func-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09622-Issue_3356.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09622-Issue_3356.c
index 7f1e0282..7f1e0282 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09622-Issue_3356.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09622-Issue_3356.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09623-vbrace_one_liner.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09623-vbrace_one_liner.c
index bff114d0..bff114d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/09623-vbrace_one_liner.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/09623-vbrace_one_liner.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10003-incdec_postfix_multiply.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10003-incdec_postfix_multiply.c
index 51c2b3a3..51c2b3a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10003-incdec_postfix_multiply.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10003-incdec_postfix_multiply.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10004-pragma_asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10004-pragma_asm.c
index 0e6b48d6..0e6b48d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10004-pragma_asm.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10004-pragma_asm.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10005-i1270.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10005-i1270.c
index 4831a47a..4831a47a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10005-i1270.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10005-i1270.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10006-bug_2331.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10006-bug_2331.c
index 67088d94..67088d94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10006-bug_2331.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10006-bug_2331.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10007-indent-macro-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10007-indent-macro-brace.c
index 192a399f..192a399f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10007-indent-macro-brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10007-indent-macro-brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10008-indent-macro-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10008-indent-macro-brace.c
index a54cd504..a54cd504 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10008-indent-macro-brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10008-indent-macro-brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10009-return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10009-return-compound-literal.c
index fad9a3f2..fad9a3f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10009-return-compound-literal.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10009-return-compound-literal.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10010-return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10010-return-compound-literal.c
index da33e2fd..da33e2fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10010-return-compound-literal.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10010-return-compound-literal.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10011-return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10011-return-compound-literal.c
index fad9a3f2..fad9a3f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10011-return-compound-literal.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10011-return-compound-literal.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10012-sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10012-sparen-indent.c
index d9ddbe06..d9ddbe06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10012-sparen-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10012-sparen-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10013-sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10013-sparen-indent.c
index b09a3102..b09a3102 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10013-sparen-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10013-sparen-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10014-sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10014-sparen-indent.c
index bf0ba8cf..bf0ba8cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10014-sparen-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10014-sparen-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10015-Issue_2845.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10015-Issue_2845.h
index 9f34b1dc..9f34b1dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10015-Issue_2845.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10015-Issue_2845.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10016-Issue_3233.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10016-Issue_3233.c
index ccb53151..ccb53151 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10016-Issue_3233.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10016-Issue_3233.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10017-double-sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10017-double-sparen.c
index 6633006e..6633006e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10017-double-sparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10017-double-sparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10018-double-sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10018-double-sparen.c
index f77262fe..f77262fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10018-double-sparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10018-double-sparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10019-include-guard.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10019-include-guard.h
index e742dd4c..e742dd4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10019-include-guard.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10019-include-guard.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10020-single_line_comment_after.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10020-single_line_comment_after.c
index 527b3e80..527b3e80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10020-single_line_comment_after.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10020-single_line_comment_after.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10021-parenthesized_indirect_call.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10021-parenthesized_indirect_call.c
index 7fd4d573..7fd4d573 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10021-parenthesized_indirect_call.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10021-parenthesized_indirect_call.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10022-Issue_3269.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10022-Issue_3269.c
index 6baef61c..6baef61c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10022-Issue_3269.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10022-Issue_3269.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10023-Issue_3272.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10023-Issue_3272.h
index 673c5a91..673c5a91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10023-Issue_3272.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10023-Issue_3272.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10024-Issue_3274.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10024-Issue_3274.c
index f8b9f789..f8b9f789 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10024-Issue_3274.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10024-Issue_3274.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10025-forever.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10025-forever.c
index fc14ccf1..fc14ccf1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10025-forever.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10025-forever.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10026-forever.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10026-forever.c
index 94dc8ce1..94dc8ce1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10026-forever.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10026-forever.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10027-Issue_3327.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10027-Issue_3327.c
index 92ec0779..92ec0779 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10027-Issue_3327.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10027-Issue_3327.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10028-Issue_3339.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10028-Issue_3339.c
index fa6872e4..fa6872e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10028-Issue_3339.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10028-Issue_3339.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10029-Issue_3339.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10029-Issue_3339.c
index 0b9b50e1..0b9b50e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10029-Issue_3339.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10029-Issue_3339.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10030-Issue_3339.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10030-Issue_3339.c
index fb71b266..fb71b266 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10030-Issue_3339.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10030-Issue_3339.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10031-Issue_3342.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10031-Issue_3342.c
index 986aab70..986aab70 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10031-Issue_3342.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10031-Issue_3342.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10032-Issue_3345.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10032-Issue_3345.c
index eec63b28..eec63b28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10032-Issue_3345.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10032-Issue_3345.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10033-Issue_3343.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10033-Issue_3343.c
index 6acdb70e..6acdb70e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10033-Issue_3343.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10033-Issue_3343.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10034-Issue_3343.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10034-Issue_3343.c
index 31eddc22..31eddc22 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10034-Issue_3343.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10034-Issue_3343.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10035-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10035-comment-indent.c
index 4486816e..4486816e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10035-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10035-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10036-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10036-comment-indent.c
index 9ac0677f..9ac0677f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10036-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10036-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10037-Issue_3362.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10037-Issue_3362.c
index abff8de4..abff8de4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10037-Issue_3362.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10037-Issue_3362.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10038-Issue_3362.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10038-Issue_3362.c
index 7a8c08f3..7a8c08f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10038-Issue_3362.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10038-Issue_3362.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10039-Issue_3370.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10039-Issue_3370.c
index 2586a3b4..2586a3b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10039-Issue_3370.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10039-Issue_3370.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10040-Issue_3377.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10040-Issue_3377.c
index fc4aa694..fc4aa694 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10040-Issue_3377.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10040-Issue_3377.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10041-Issue_3351.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10041-Issue_3351.c
index 592fc511..592fc511 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10041-Issue_3351.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10041-Issue_3351.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10042-Issue_3376.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10042-Issue_3376.c
index 084e9c7d..084e9c7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10042-Issue_3376.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10042-Issue_3376.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10043-Issue_3376.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10043-Issue_3376.c
index 6874a984..6874a984 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10043-Issue_3376.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10043-Issue_3376.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10044-Issue_3376.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10044-Issue_3376.c
index b6ea490d..b6ea490d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10044-Issue_3376.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10044-Issue_3376.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10045-Issue_3376.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10045-Issue_3376.c
index fa3776db..fa3776db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10045-Issue_3376.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10045-Issue_3376.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10046-Issue_3402.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10046-Issue_3402.c
index 03f5b5bb..03f5b5bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10046-Issue_3402.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10046-Issue_3402.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10047-Issue_3421.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10047-Issue_3421.h
index cdc3b4f0..cdc3b4f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10047-Issue_3421.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10047-Issue_3421.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10048-Issue_3431.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10048-Issue_3431.c
index 1af6603e..1af6603e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10048-Issue_3431.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10048-Issue_3431.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10049-Issue_3436.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10049-Issue_3436.c
index d921d9ed..d921d9ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10049-Issue_3436.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10049-Issue_3436.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10050-Issue_3192.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10050-Issue_3192.c
index a6ff66a2..a6ff66a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10050-Issue_3192.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10050-Issue_3192.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10051-Issue_3454.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10051-Issue_3454.c
index 8be230dd..8be230dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10051-Issue_3454.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10051-Issue_3454.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10052-Issue_3472.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10052-Issue_3472.c
index d180a700..d180a700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10052-Issue_3472.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10052-Issue_3472.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10053-Issue_3476.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10053-Issue_3476.c
index 92a7b0c0..92a7b0c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10053-Issue_3476.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10053-Issue_3476.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10054-Issue_3480.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10054-Issue_3480.c
index 6a25879a..6a25879a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10054-Issue_3480.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10054-Issue_3480.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10055-Issue_3493.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10055-Issue_3493.c
index 66554d57..66554d57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10055-Issue_3493.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10055-Issue_3493.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10056-Issue_3496.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10056-Issue_3496.h
index b0509bd5..b0509bd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10056-Issue_3496.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10056-Issue_3496.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10057-Issue_3496.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10057-Issue_3496.h
index 23fbf3b8..23fbf3b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10057-Issue_3496.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10057-Issue_3496.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10058-Issue_3496.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10058-Issue_3496.h
index 3f056c45..3f056c45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10058-Issue_3496.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10058-Issue_3496.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10059-Issue_3496.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10059-Issue_3496.h
index f914f255..f914f255 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10059-Issue_3496.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10059-Issue_3496.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10060-Issue_3548.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10060-Issue_3548.c
index 71824adc..71824adc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10060-Issue_3548.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10060-Issue_3548.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10061-Issue_3556.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10061-Issue_3556.c
index 423e07f0..423e07f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10061-Issue_3556.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10061-Issue_3556.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10062-Issue_3561.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10062-Issue_3561.c
index db5c5afc..db5c5afc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10062-Issue_3561.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10062-Issue_3561.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10063-Issue_3565.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10063-Issue_3565.c
index 267e25bd..267e25bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10063-Issue_3565.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10063-Issue_3565.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10064-Issue_3567.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10064-Issue_3567.c
index a56a513c..a56a513c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10064-Issue_3567.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10064-Issue_3567.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10065-Issue_3567.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10065-Issue_3567.c
index 3538b0f6..3538b0f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10065-Issue_3567.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10065-Issue_3567.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10066-Issue_3580.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10066-Issue_3580.c
index c2baeb12..c2baeb12 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10066-Issue_3580.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10066-Issue_3580.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10077-Issue_3582.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10077-Issue_3582.c
index 65cd5354..65cd5354 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10077-Issue_3582.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10077-Issue_3582.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10078-Issue_3587.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10078-Issue_3587.h
index 3744884f..3744884f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10078-Issue_3587.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10078-Issue_3587.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10079-Issue_3662.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10079-Issue_3662.c
index f27f37e9..f27f37e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10079-Issue_3662.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10079-Issue_3662.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10080-infinite-loops.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10080-infinite-loops.c
index 71d52db7..71d52db7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10080-infinite-loops.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10080-infinite-loops.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10081-infinite-loops.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10081-infinite-loops.c
index 0505f2a5..6898a551 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10081-infinite-loops.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10081-infinite-loops.c
@@ -31,13 +31,13 @@ int main(void)
 	for (;;) {
 	}
 
-	for(;;)     {
+	for(;;) {
 	}
 
 	for(;;) {
 	}
 
-	for(;;)  {
+	for(;;) {
 	}
 
 	for(;;) {
@@ -48,11 +48,11 @@ int main(void)
 
 	for (;;) {}
 
-	for(;;)     {}
+	for(;;) {}
 
 	for(;;) {}
 
-	for(;;)  {}
+	for(;;) {}
 
 	for(;;) {}
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10082-infinite-loops.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10082-infinite-loops.c
index 1dd02553..1dd02553 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10082-infinite-loops.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10082-infinite-loops.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10083-infinite-loops.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10083-infinite-loops.c
index 0d514c0f..0d514c0f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10083-infinite-loops.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10083-infinite-loops.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10084-infinite-loops.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10084-infinite-loops.c
index 1f2eccdd..8d529ec8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10084-infinite-loops.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10084-infinite-loops.c
@@ -31,7 +31,7 @@ int main(void)
 	while(1) {
 	}
 
-	while(1)   {
+	while(1) {
 	}
 
 	while(1) {
@@ -48,7 +48,7 @@ int main(void)
 
 	while(1) {}
 
-	while(1)   {}
+	while(1) {}
 
 	while(1) {}
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10085-infinite-loops.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10085-infinite-loops.c
index 45841c76..45841c76 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10085-infinite-loops.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10085-infinite-loops.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10086-infinite-loops.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10086-infinite-loops.c
index 0bdd0220..774b8413 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10086-infinite-loops.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10086-infinite-loops.c
@@ -31,13 +31,13 @@ int main(void)
 	for (;;) {
 	}
 
-	for(;;)     {
+	for(;;) {
 	}
 
 	for(;;) {
 	}
 
-	for(;;)  {
+	for(;;) {
 	}
 
 	for(;;) {
@@ -48,11 +48,11 @@ int main(void)
 
 	for (;;) {}
 
-	for(;;)     {}
+	for(;;) {}
 
 	for(;;) {}
 
-	for(;;)  {}
+	for(;;) {}
 
 	for(;;) {}
 
@@ -63,7 +63,7 @@ int main(void)
 		x++;
 	}
 
-	for(;;)   {
+	for(;;) {
 		x++;
 	}
 
@@ -84,7 +84,7 @@ int main(void)
 
 	for (;;) {x++;}
 
-	for(;;)   {x++;}
+	for(;;) {x++;}
 
 	for(;;) {x++;}
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10087-infinite-loops.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10087-infinite-loops.c
index bd10fa6c..bd10fa6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10087-infinite-loops.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10087-infinite-loops.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10088-infinite-loops.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10088-infinite-loops.c
index 082730b7..082730b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10088-infinite-loops.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10088-infinite-loops.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10089-infinite-loops.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10089-infinite-loops.c
index 8d02250f..9094e611 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10089-infinite-loops.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10089-infinite-loops.c
@@ -31,7 +31,7 @@ int main(void)
 	while(1) {
 	}
 
-	while(1)   {
+	while(1) {
 	}
 
 	while(1) {
@@ -48,7 +48,7 @@ int main(void)
 
 	while(1) {}
 
-	while(1)   {}
+	while(1) {}
 
 	while(1) {}
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10090-infinite-loops.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10090-infinite-loops.c
index 301435cb..301435cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10090-infinite-loops.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10090-infinite-loops.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10091-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10091-int-types.c
index ef816676..ef816676 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10091-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10091-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10092-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10092-int-types.c
index c8342e53..c8342e53 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10092-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10092-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10093-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10093-int-types.c
index 1095528c..1095528c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10093-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10093-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10094-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10094-int-types.c
index 4ea57931..4ea57931 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10094-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10094-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10095-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10095-int-types.c
index d856e20d..d856e20d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10095-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10095-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10096-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10096-int-types.c
index d25a1589..d25a1589 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10096-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10096-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10097-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10097-int-types.c
index cbf7c128..cbf7c128 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10097-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10097-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10098-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10098-int-types.c
index 3553f9bc..3553f9bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10098-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10098-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10099-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10099-int-types.c
index d6d07b82..d6d07b82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10099-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10099-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10100-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10100-int-types.c
index fd4d4fe6..fd4d4fe6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10100-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10100-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10101-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10101-int-types.c
index a81cbc62..a81cbc62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10101-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10101-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10102-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10102-int-types.c
index 9edf7fcc..9edf7fcc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10102-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10102-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10103-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10103-int-types.c
index 15cf2dd5..15cf2dd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10103-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10103-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10104-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10104-int-types.c
index 9b3c8720..9b3c8720 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10104-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10104-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10105-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10105-int-types.c
index 57924029..57924029 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10105-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10105-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10106-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10106-int-types.c
index fbe47a9a..fbe47a9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10106-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10106-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10107-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10107-int-types.c
index 142159aa..142159aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10107-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10107-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10108-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10108-int-types.c
index 9e69f009..9e69f009 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10108-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10108-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10109-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10109-int-types.c
index 142159aa..142159aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10109-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10109-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10110-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10110-int-types.c
index 9e69f009..9e69f009 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10110-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10110-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10111-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10111-int-types.c
index c7b58ba0..c7b58ba0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10111-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10111-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10112-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10112-int-types.c
index ac42591f..ac42591f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10112-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10112-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10113-int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10113-int-types.c
index f4085895..f4085895 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/c/10113-int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10113-int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10114-Issue_3989.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10114-Issue_3989.c
new file mode 100644
index 00000000..ee975151
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10114-Issue_3989.c
@@ -0,0 +1 @@
+int * foo(int*);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10120-sp_after_sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10120-sp_after_sparen.c
new file mode 100644
index 00000000..4aa04624
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10120-sp_after_sparen.c
@@ -0,0 +1,9 @@
+if (true)   x();
+
+while (true)x();
+
+while(true)   x();
+
+for (;;)    {
+	x()
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10121-sp_after_sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10121-sp_after_sparen.c
new file mode 100644
index 00000000..f57b15bf
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10121-sp_after_sparen.c
@@ -0,0 +1,9 @@
+if (true)   x();
+
+while (true) x();
+
+while(true)   x();
+
+for (;;)    {
+	x()
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10122-sp_after_sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10122-sp_after_sparen.c
new file mode 100644
index 00000000..885677ef
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10122-sp_after_sparen.c
@@ -0,0 +1,9 @@
+if (true)x();
+
+while (true)x();
+
+while(true)x();
+
+for (;;){
+	x()
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10123-sp_after_sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10123-sp_after_sparen.c
new file mode 100644
index 00000000..9224387d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10123-sp_after_sparen.c
@@ -0,0 +1,9 @@
+if (true) x();
+
+while (true) x();
+
+while(true) x();
+
+for (;;) {
+	x()
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10124-Issue_3985.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10124-Issue_3985.c
new file mode 100644
index 00000000..735e40f6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10124-Issue_3985.c
@@ -0,0 +1,14 @@
+int keep_symbol()
+{
+	if (
+#ifdef HAVE_BFD_2_34
+		bfd_section_size() == 0
+#else
+		bfd_get_section_size() == 0
+#endif
+		)
+	{
+		return false;
+	}
+	return true;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10125-Issue_3992.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10125-Issue_3992.c
new file mode 100644
index 00000000..02becdba
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/c/10125-Issue_3992.c
@@ -0,0 +1,6 @@
+UUID guid_decode()
+{
+	UUID id = { 0x00000000, 0x0000, 0x0000, 0x0000, id1 };
+
+	UUID id = { 0x00000000, 0x0000, 0x0000, 0x0000, { id2 } };
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/02102-indent-c.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/02102-indent-c.cpp
index 978dfae4..53b37612 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/02102-indent-c.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/02102-indent-c.cpp
@@ -188,20 +188,20 @@ static void indent_pse_push(struct parse_frame& frm, Chunk *pc)
   static int ref = 0;
 
     /* check the stack depth */
-  if (frm.pse_tos < (int)ARRAY_SIZE(frm.pse))
+  if (frm.m_parenStack_tos < (int)ARRAY_SIZE(frm.m_parenStack))
     {
       /* Bump up the index and initialize it */
     frm.pse_tos++;
-    memset(&frm.pse[frm.pse_tos], 0, sizeof(frm.pse[frm.pse_tos]));
+    memset(&frm.m_parenStack[frm.m_parenStack_tos], 0, sizeof(frm.m_parenStack[frm.m_parenStack_tos]));
 
     LOG_FMT(LINDPSE, "%4d] OPEN  [%d,%s] level=%d\n",
             pc->GetOrigLine(), frm.pse_tos, get_token_name(pc->GetType()), pc->GetLevel());
 
-    frm.pse[frm.pse_tos].type       = pc->GetType();
-    frm.pse[frm.pse_tos].level      = pc->GetLevel();
-    frm.pse[frm.pse_tos].open_line  = pc->GetOrigLine();
-    frm.pse[frm.pse_tos].ref        = ++ref;
-    frm.pse[frm.pse_tos].in_preproc = (pc->GetFlags() & PCF_IN_PREPROC) != 0;
+    frm.m_parenStack[frm.m_parenStack_tos].type       = pc->GetType();
+    frm.m_parenStack[frm.m_parenStack_tos].level      = pc->GetLevel();
+    frm.m_parenStack[frm.m_parenStack_tos].open_line  = pc->GetOrigLine();
+    frm.m_parenStack[frm.m_parenStack_tos].ref        = ++ref;
+    frm.m_parenStack[frm.m_parenStack_tos].in_preproc = (pc->GetFlags() & PCF_IN_PREPROC) != 0;
     }
   }
 
@@ -220,17 +220,17 @@ static void indent_pse_pop(struct parse_frame& frm, Chunk *pc)
       {
       LOG_FMT(LINDPSE, "%4d] CLOSE [%d,%s] on %s, started on line %d, level=%d/%d\n",
               pc->GetOrigLine(), frm.pse_tos,
-              get_token_name(frm.pse[frm.pse_tos].type),
+              get_token_name(frm.m_parenStack[frm.m_parenStack_tos].type),
               get_token_name(pc->GetType()),
-              frm.pse[frm.pse_tos].open_line,
-              frm.pse[frm.pse_tos].level,
+              frm.m_parenStack[frm.m_parenStack_tos].open_line,
+              frm.m_parenStack[frm.m_parenStack_tos].level,
               pc->GetLevel());
       }
     else
       {
       LOG_FMT(LINDPSE, " EOF] CLOSE [%d,%s], started on line %d\n",
-              frm.pse_tos, get_token_name(frm.pse[frm.pse_tos].type),
-              frm.pse[frm.pse_tos].open_line);
+              frm.m_parenStack_tos, get_token_name(frm.m_parenStack[frm.m_parenStack_tos].type),
+              frm.m_parenStack[frm.m_parenStack_tos].open_line);
       }
 
     frm.pse_tos--;
@@ -288,9 +288,9 @@ void indent_text(void)
   memset(&frm, 0, sizeof(frm));
 
     /* dummy top-level entry */
-  frm.pse[0].indent     = 1;
-  frm.pse[0].indent_tmp = 1;
-  frm.pse[0].type       = CT_EOF;
+  frm.m_parenStack[0].indent     = 1;
+  frm.m_parenStack[0].indent_tmp = 1;
+  frm.m_parenStack[0].type       = CT_EOF;
 
   pc = Chunk::GetHead();
 
@@ -305,7 +305,7 @@ void indent_text(void)
 
       /* Clean up after a #define */
     if (!in_preproc)
-      while ((frm.pse_tos > 0) && frm.pse[frm.pse_tos].in_preproc)
+      while ((frm.m_parenStack_tos > 0) && frm.m_parenStack[frm.m_parenStack_tos].in_preproc)
         indent_pse_pop(frm, pc);
 
     else
@@ -318,8 +318,8 @@ void indent_text(void)
         frm.level++;
         indent_pse_push(frm, pc);
 
-        frm.pse[frm.pse_tos].indent     = 1 + indent_size;
-        frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
+        frm.m_parenStack[frm.m_parenStack_tos].indent     = 1 + indent_size;
+        frm.m_parenStack[frm.m_parenStack_tos].indent_tmp = frm.m_parenStack[frm.m_parenStack_tos].indent;
         }
       }
 
@@ -347,14 +347,14 @@ void indent_text(void)
       if (!pc->IsNewline() &&
           !pc->IsComment() &&
           ((pc->GetFlags() & PCF_IN_PREPROC) == 0) &&
-          (frm.pse[frm.pse_tos].level > pc->GetLevel()))
+          (frm.m_parenStack[frm.m_parenStack_tos].level > pc->GetLevel()))
         indent_pse_pop(frm, pc);
 
-      if (frm.pse[frm.pse_tos].level == pc->GetLevel())
+      if (frm.m_parenStack[frm.m_parenStack_tos].level == pc->GetLevel())
         {
           /* process virtual braces closes (no text output) */
         if ((pc->GetType() == CT_VBRACE_CLOSE) &&
-            (frm.pse[frm.pse_tos].type == CT_VBRACE_OPEN))
+            (frm.m_parenStack[frm.m_parenStack_tos].type == CT_VBRACE_OPEN))
           {
           indent_pse_pop(frm, pc);
           frm.level--;
@@ -362,31 +362,31 @@ void indent_text(void)
           }
 
           /* End any assign operations with a semicolon on the same level */
-        if ((frm.pse[frm.pse_tos].type == CT_ASSIGN) &&
+        if ((frm.m_parenStack[frm.m_parenStack_tos].type == CT_ASSIGN) &&
             (pc->IsSemicolon() ||
              (pc->GetType() == CT_COMMA) ||
              (pc->GetType() == CT_BRACE_OPEN)))
           indent_pse_pop(frm, pc);
 
           /* End any CPP class colon crap */
-        if ((frm.pse[frm.pse_tos].type == CT_CLASS_COLON) &&
+        if ((frm.m_parenStack[frm.m_parenStack_tos].type == CT_CLASS_COLON) &&
             ((pc->GetType() == CT_BRACE_OPEN) ||
              pc->IsSemicolon()))
           indent_pse_pop(frm, pc);
 
           /* a case is ended with another case or a close brace */
-        if ((frm.pse[frm.pse_tos].type == CT_CASE) &&
+        if ((frm.m_parenStack[frm.m_parenStack_tos].type == CT_CASE) &&
             ((pc->GetType() == CT_BRACE_CLOSE) ||
              (pc->GetType() == CT_CASE)))
           indent_pse_pop(frm, pc);
 
           /* a return is ended with a semicolon */
-        if ((frm.pse[frm.pse_tos].type == CT_RETURN) &&
+        if ((frm.m_parenStack[frm.m_parenStack_tos].type == CT_RETURN) &&
             pc->IsSemicolon())
           indent_pse_pop(frm, pc);
 
           /* Close out parens and squares */
-        if ((frm.pse[frm.pse_tos].type == (pc->GetType() - 1)) &&
+        if ((frm.m_parenStack[frm.m_parenStack_tos].type == (pc->GetType() - 1)) &&
             ((pc->GetType() == CT_PAREN_CLOSE) ||
              (pc->GetType() == CT_SPAREN_CLOSE) ||
              (pc->GetType() == CT_FPAREN_CLOSE) ||
@@ -394,23 +394,23 @@ void indent_text(void)
              (pc->GetType() == CT_ANGLE_CLOSE)))
           {
           indent_pse_pop(frm, pc);
-          frm.paren_count--;
+          frm.SetParenCount(frm.GetParenCount() - 1);
           }
         }
       }
     while (old_pse_tos > frm.pse_tos);
 
       /* Grab a copy of the current indent */
-    indent_column = frm.pse[frm.pse_tos].indent_tmp;
+    indent_column = frm.m_parenStack[frm.m_parenStack_tos].indent_tmp;
 
     if (!pc->IsNewline() && !pc->IsComment())
       {
       LOG_FMT(LINDPC, " -=[ %.*s ]=- top=%d %s %d/%d\n",
               pc->len, pc->GetStr(),
               frm.pse_tos,
-              get_token_name(frm.pse[frm.pse_tos].type),
-              frm.pse[frm.pse_tos].indent_tmp,
-              frm.pse[frm.pse_tos].indent);
+              get_token_name(frm.m_parenStack[frm.m_parenStack_tos].type),
+              frm.m_parenStack[frm.m_parenStack_tos].indent_tmp,
+              frm.m_parenStack[frm.m_parenStack_tos].indent);
       }
 
     /**
@@ -431,7 +431,7 @@ void indent_text(void)
 
     if (pc->GetType() == CT_BRACE_CLOSE)
       {
-      if (frm.pse[frm.pse_tos].type == CT_BRACE_OPEN)
+      if (frm.m_parenStack[frm.m_parenStack_tos].type == CT_BRACE_OPEN)
         {
         indent_pse_pop(frm, pc);
         frm.level--;
@@ -439,7 +439,7 @@ void indent_text(void)
           /* Update the indent_column if needed */
         if (!cpd.settings[UO_indent_braces].b &&
             (parent_token_indent == 0))
-          indent_column = frm.pse[frm.pse_tos].indent_tmp;
+          indent_column = frm.m_parenStack[frm.m_parenStack_tos].indent_tmp;
 
         if ((pc->GetParentType() == CT_IF) ||
             (pc->GetParentType() == CT_ELSE) ||
@@ -456,24 +456,24 @@ void indent_text(void)
       frm.level++;
       indent_pse_push(frm, pc);
 
-      frm.pse[frm.pse_tos].indent     = frm.pse[frm.pse_tos - 1].indent + indent_size;
-      frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
+      frm.m_parenStack[frm.m_parenStack_tos].indent     = frm.m_parenStack[frm.m_parenStack_tos - 1].indent + indent_size;
+      frm.m_parenStack[frm.m_parenStack_tos].indent_tmp = frm.m_parenStack[frm.m_parenStack_tos].indent;
 
         /* Always indent on virtual braces */
-      indent_column = frm.pse[frm.pse_tos].indent_tmp;
+      indent_column = frm.m_parenStack[frm.m_parenStack_tos].indent_tmp;
       }
     else if (pc->GetType() == CT_BRACE_OPEN)
       {
       frm.level++;
       indent_pse_push(frm, pc);
 
-      if (frm.paren_count != 0)
+      if (frm.GetParenCount() != 0)
           /* We are inside ({ ... }) -- indent one tab from the paren */
-        frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent_tmp + indent_size;
+        frm.m_parenStack[frm.m_parenStack_tos].indent = frm.m_parenStack[frm.m_parenStack_tos - 1].indent_tmp + indent_size;
       else
         {
           /* Use the prev indent level + indent_size. */
-        frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent + indent_size;
+        frm.m_parenStack[frm.m_parenStack_tos].indent = frm.m_parenStack[frm.m_parenStack_tos - 1].indent + indent_size;
 
           /* If this brace is part of a statement, bump it out by indent_brace */
         if ((pc->GetParentType() == CT_IF) ||
@@ -485,28 +485,28 @@ void indent_text(void)
             (pc->GetParentType() == CT_FOR))
           {
           if (parent_token_indent != 0)
-            frm.pse[frm.pse_tos].indent += parent_token_indent - indent_size;
+            frm.m_parenStack[frm.m_parenStack_tos].indent += parent_token_indent - indent_size;
           else
             {
-            frm.pse[frm.pse_tos].indent += cpd.settings[UO_indent_brace].n;
+            frm.m_parenStack[frm.m_parenStack_tos].indent += cpd.settings[UO_indent_brace].n;
             indent_column += cpd.settings[UO_indent_brace].n;
             }
           }
         else if (pc->GetParentType() == CT_CASE)
           {
             /* The indent_case_brace setting affects the parent CT_CASE */
-          frm.pse[frm.pse_tos].indent_tmp += cpd.settings[UO_indent_case_brace].n;
-          frm.pse[frm.pse_tos].indent     += cpd.settings[UO_indent_case_brace].n;
+          frm.m_parenStack[frm.m_parenStack_tos].indent_tmp += cpd.settings[UO_indent_case_brace].n;
+          frm.m_parenStack[frm.m_parenStack_tos].indent     += cpd.settings[UO_indent_case_brace].n;
           }
         else if ((pc->GetParentType() == CT_CLASS) && !cpd.settings[UO_indent_class].b)
-          frm.pse[frm.pse_tos].indent -= indent_size;
+          frm.m_parenStack[frm.m_parenStack_tos].indent -= indent_size;
         else if ((pc->GetParentType() == CT_NAMESPACE) && !cpd.settings[UO_indent_namespace].b)
-          frm.pse[frm.pse_tos].indent -= indent_size;
+          frm.m_parenStack[frm.m_parenStack_tos].indent -= indent_size;
         }
 
       if ((pc->GetFlags() & PCF_DONT_INDENT) != 0)
         {
-        frm.pse[frm.pse_tos].indent = pc->GetColumn();
+        frm.m_parenStack[frm.m_parenStack_tos].indent = pc->GetColumn();
         indent_column = pc->GetColumn();
         }
       else
@@ -521,29 +521,29 @@ void indent_text(void)
         next = pc->GetNextNcNnl();
 
         if (!pc->IsNewlineBetween(next))
-          frm.pse[frm.pse_tos].indent = next->GetColumn();
+          frm.m_parenStack[frm.m_parenStack_tos].indent = next->GetColumn();
 
-        frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
-        frm.pse[frm.pse_tos].open_line  = pc->GetOrigLine();
+        frm.m_parenStack[frm.m_parenStack_tos].indent_tmp = frm.m_parenStack[frm.m_parenStack_tos].indent;
+        frm.m_parenStack[frm.m_parenStack_tos].open_line  = pc->GetOrigLine();
 
           /* Update the indent_column if needed */
         if (cpd.settings[UO_indent_braces].n ||
             (parent_token_indent != 0))
-          indent_column = frm.pse[frm.pse_tos].indent_tmp;
+          indent_column = frm.m_parenStack[frm.m_parenStack_tos].indent_tmp;
         }
       }
     else if (pc->GetType() == CT_CASE)
       {
         /* Start a case - indent UO_indent_switch_case from the switch level */
-      tmp = frm.pse[frm.pse_tos].indent + cpd.settings[UO_indent_switch_case].n;
+      tmp = frm.m_parenStack[frm.m_parenStack_tos].indent + cpd.settings[UO_indent_switch_case].n;
 
       indent_pse_push(frm, pc);
 
-      frm.pse[frm.pse_tos].indent     = tmp;
-      frm.pse[frm.pse_tos].indent_tmp = tmp - indent_size;
+      frm.m_parenStack[frm.m_parenStack_tos].indent     = tmp;
+      frm.m_parenStack[frm.m_parenStack_tos].indent_tmp = tmp - indent_size;
 
         /* Always set on case statements */
-      indent_column = frm.pse[frm.pse_tos].indent_tmp;
+      indent_column = frm.m_parenStack[frm.m_parenStack_tos].indent_tmp;
       }
     else if (pc->GetType() == CT_LABEL)
       {
@@ -551,17 +551,17 @@ void indent_text(void)
       if (cpd.settings[UO_indent_label].n > 0)
         indent_column = cpd.settings[UO_indent_label].n;
       else
-        indent_column = frm.pse[frm.pse_tos].indent +
+        indent_column = frm.m_parenStack[frm.m_parenStack_tos].indent +
                         cpd.settings[UO_indent_label].n;
       }
     else if (pc->GetType() == CT_CLASS_COLON)
       {
         /* just indent one level */
       indent_pse_push(frm, pc);
-      frm.pse[frm.pse_tos].indent     = frm.pse[frm.pse_tos - 1].indent_tmp + indent_size;
-      frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
+      frm.m_parenStack[frm.m_parenStack_tos].indent     = frm.m_parenStack[frm.m_parenStack_tos - 1].indent_tmp + indent_size;
+      frm.m_parenStack[frm.m_parenStack_tos].indent_tmp = frm.m_parenStack[frm.m_parenStack_tos].indent;
 
-      indent_column = frm.pse[frm.pse_tos].indent_tmp;
+      indent_column = frm.m_parenStack[frm.m_parenStack_tos].indent_tmp;
 
       if (cpd.settings[UO_indent_class_colon].b)
         {
@@ -569,7 +569,7 @@ void indent_text(void)
 
         if (prev->IsNewline())
           {
-          frm.pse[frm.pse_tos].indent += 2;
+          frm.m_parenStack[frm.m_parenStack_tos].indent += 2;
           /* don't change indent of current line */
           }
         }
@@ -582,12 +582,12 @@ void indent_text(void)
       {
         /* Open parens and squares - never update indent_column */
       indent_pse_push(frm, pc);
-      frm.pse[frm.pse_tos].indent = pc->GetColumn() + pc->len;
+      frm.m_parenStack[frm.m_parenStack_tos].indent = pc->GetColumn() + pc->len;
 
       if (cpd.settings[UO_indent_func_call_param].b &&
           (pc->GetType() == CT_FPAREN_OPEN) &&
           (pc->GetParentType() == CT_FUNC_CALL))
-        frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent + indent_size;
+        frm.m_parenStack[frm.m_parenStack_tos].indent = frm.m_parenStack[frm.m_parenStack_tos - 1].indent + indent_size;
 
       if ((chunk_is_str(pc, "(", 1) && !cpd.settings[UO_indent_paren_nl].b) ||
           (chunk_is_str(pc, "[", 1) && !cpd.settings[UO_indent_square_nl].b))
@@ -598,15 +598,15 @@ void indent_text(void)
           {
           int sub = 1;
 
-          if (frm.pse[frm.pse_tos - 1].type == CT_ASSIGN)
+          if (frm.m_parenStack[frm.m_parenStack_tos - 1].type == CT_ASSIGN)
             sub = 2;
 
-          frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - sub].indent + indent_size;
+          frm.m_parenStack[frm.m_parenStack_tos].indent = frm.m_parenStack[frm.m_parenStack_tos - sub].indent + indent_size;
           }
         }
 
-      frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
-      frm.paren_count++;
+      frm.m_parenStack[frm.m_parenStack_tos].indent_tmp = frm.m_parenStack[frm.m_parenStack_tos].indent;
+      frm.SetParenCount(frm.GetParenCount() + 1);
       }
     else if (pc->GetType() == CT_ASSIGN)
       {
@@ -622,11 +622,11 @@ void indent_text(void)
         indent_pse_push(frm, pc);
 
         if (next->IsNewline())
-          frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent_tmp + indent_size;
+          frm.m_parenStack[frm.m_parenStack_tos].indent = frm.m_parenStack[frm.m_parenStack_tos - 1].indent_tmp + indent_size;
         else
-          frm.pse[frm.pse_tos].indent = pc->GetColumn() + pc->len + 1;
+          frm.m_parenStack[frm.m_parenStack_tos].indent = pc->GetColumn() + pc->len + 1;
 
-        frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
+        frm.m_parenStack[frm.m_parenStack_tos].indent_tmp = frm.m_parenStack[frm.m_parenStack_tos].indent;
         }
       }
     else if (pc->GetType() == CT_RETURN)
@@ -635,8 +635,8 @@ void indent_text(void)
       if (pc->GetLevel() == pc->GetBraceLevel())
         {
         indent_pse_push(frm, pc);
-        frm.pse[frm.pse_tos].indent     = frm.pse[frm.pse_tos - 1].indent + pc->len + 1;
-        frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos - 1].indent;
+        frm.m_parenStack[frm.m_parenStack_tos].indent     = frm.m_parenStack[frm.m_parenStack_tos - 1].indent + pc->len + 1;
+        frm.m_parenStack[frm.m_parenStack_tos].indent_tmp = frm.m_parenStack[frm.m_parenStack_tos - 1].indent;
         }
       }
     else if (chunk_is_str(pc, "<<", 2))
@@ -701,8 +701,8 @@ void indent_text(void)
       else if (pc->IsComment())
         {
         LOG_FMT(LINDENT, "%s: %d] comment => %d\n",
-                __func__, pc->GetOrigLine(), frm.pse[frm.pse_tos].indent_tmp);
-        indent_comment(pc, frm.pse[frm.pse_tos].indent_tmp);
+                __func__, pc->GetOrigLine(), frm.m_parenStack[frm.m_parenStack_tos].indent_tmp);
+        indent_comment(pc, frm.m_parenStack[frm.m_parenStack_tos].indent_tmp);
         }
       else if (pc->GetType() == CT_PREPROC)
         {
@@ -740,15 +740,15 @@ void indent_text(void)
         (pc->GetType() == CT_COMMENT_MULTI) ||
         (pc->GetType() == CT_COMMENT_CPP))
       {
-      frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
+      frm.m_parenStack[frm.m_parenStack_tos].indent_tmp = frm.m_parenStack[frm.m_parenStack_tos].indent;
 
       /**
        * Handle the case of a multi-line #define w/o anything on the
        * first line (indent_tmp will be 1 or 0)
        */
       if ((pc->GetType() == CT_NL_CONT) &&
-          (frm.pse[frm.pse_tos].indent_tmp <= indent_size))
-        frm.pse[frm.pse_tos].indent_tmp = indent_size + 1;
+          (frm.m_parenStack[frm.m_parenStack_tos].indent_tmp <= indent_size))
+        frm.m_parenStack[frm.m_parenStack_tos].indent_tmp = indent_size + 1;
 
         /* Get ready to indent the next item */
       did_newline = true;
@@ -761,14 +761,14 @@ void indent_text(void)
     }
 
     /* Throw out any stuff inside a preprocessor - no need to warn */
-  while ((frm.pse_tos > 0) && frm.pse[frm.pse_tos].in_preproc)
+  while ((frm.m_parenStack_tos > 0) && frm.m_parenStack[frm.m_parenStack_tos].in_preproc)
     indent_pse_pop(frm, pc);
 
   for (idx = 1; idx <= frm.pse_tos; idx++)
     {
     LOG_FMT(LWARN, "%s:%d Unmatched %s\n",
-            cpd.filename, frm.pse[idx].open_line,
-            get_token_name(frm.pse[idx].type));
+            cpd.filename, frm.m_parenStack[idx].open_line,
+            get_token_name(frm.m_parenStack[idx].type));
     cpd.error_count++;
     }
   }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/02103-output.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/02103-output.cpp
index 9c7aa714..9c7aa714 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/02103-output.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/02103-output.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10000-621_this-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10000-621_this-spacing.cpp
index bd28a5e8..bd28a5e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10000-621_this-spacing.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10000-621_this-spacing.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp
index c466b45c..c466b45c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10002-623_caret-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10002-623_caret-spacing.cpp
index 5058ea4b..5058ea4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10002-623_caret-spacing.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10002-623_caret-spacing.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10003-633_decl-in-func-typedef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10003-633_decl-in-func-typedef.cpp
index 4160ecca..4160ecca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10003-633_decl-in-func-typedef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10003-633_decl-in-func-typedef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10004-634_extern-c-no-block.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10004-634_extern-c-no-block.cpp
index bb6b14fb..bb6b14fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10004-634_extern-c-no-block.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10004-634_extern-c-no-block.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10005-define-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10005-define-indentation.cpp
index 24370df9..24370df9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10005-define-indentation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10005-define-indentation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10006-dont-detab-strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10006-dont-detab-strings.cpp
index 11352d82..11352d82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10006-dont-detab-strings.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10006-dont-detab-strings.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10007-dont-process-defines.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10007-dont-process-defines.cpp
index 10ac8d5b..10ac8d5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10007-dont-process-defines.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10007-dont-process-defines.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10008-PR326_invalid-backslash-eol-csharp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10008-PR326_invalid-backslash-eol-csharp.cpp
index dfd33ac7..dfd33ac7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10008-PR326_invalid-backslash-eol-csharp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10008-PR326_invalid-backslash-eol-csharp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp
index ea1c724e..ea1c724e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10020-macro_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10020-macro_spaces.cpp
index 55a50766..55a50766 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10020-macro_spaces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10020-macro_spaces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10021-braces_align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10021-braces_align.cpp
index 40d966f5..40d966f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10021-braces_align.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10021-braces_align.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10022-foreach.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10022-foreach.cpp
index 2862e6ef..2862e6ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10022-foreach.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10022-foreach.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10023-for_auto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10023-for_auto.cpp
index 775031a5..775031a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10023-for_auto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10023-for_auto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10024-ifcomment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10024-ifcomment.cpp
index b41c5c6f..b41c5c6f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10024-ifcomment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10024-ifcomment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10025-qtargs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10025-qtargs.cpp
index 01d94543..01d94543 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10025-qtargs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10025-qtargs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp
index 852360a4..852360a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10027-Issue_3058.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10027-Issue_3058.cpp
index 09e1dc92..09e1dc92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10027-Issue_3058.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10027-Issue_3058.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10028-gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10028-gcc_case_ellipsis.cpp
index 852360a4..852360a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10028-gcc_case_ellipsis.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10028-gcc_case_ellipsis.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10029-gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10029-gcc_case_ellipsis.cpp
index e2d8ef8a..e2d8ef8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10029-gcc_case_ellipsis.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10029-gcc_case_ellipsis.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10047-UNI-1334.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10047-UNI-1334.cpp
index 9a856f91..9a856f91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10047-UNI-1334.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10047-UNI-1334.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10048-UNI-1335.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10048-UNI-1335.cpp
index 891b945a..891b945a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10048-UNI-1335.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10048-UNI-1335.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10050-UNI-1337.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10050-UNI-1337.cpp
index 59635c19..59635c19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10050-UNI-1337.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10050-UNI-1337.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10052-UNI-1339.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10052-UNI-1339.cpp
index 255db223..255db223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10052-UNI-1339.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10052-UNI-1339.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10053-UNI-1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10053-UNI-1340.cpp
index 2a96aa31..2a96aa31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10053-UNI-1340.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10053-UNI-1340.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10054-UNI-1344.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10054-UNI-1344.cpp
index 43c4429e..43c4429e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10054-UNI-1344.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10054-UNI-1344.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10056-UNI-1346.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10056-UNI-1346.cpp
index af875c3e..af875c3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10056-UNI-1346.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10056-UNI-1346.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10057-UNI-1347.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10057-UNI-1347.cpp
index ec8f350b..ec8f350b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10057-UNI-1347.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10057-UNI-1347.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10060-UNI-1350.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10060-UNI-1350.cpp
index 7353e915..7353e915 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10060-UNI-1350.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10060-UNI-1350.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10062-UNI-1356.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10062-UNI-1356.cpp
index c70ca61d..c70ca61d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10062-UNI-1356.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10062-UNI-1356.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10063-UNI-1358.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10063-UNI-1358.cpp
index 120aa9c4..120aa9c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10063-UNI-1358.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10063-UNI-1358.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10069-UNI-1980.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10069-UNI-1980.cpp
index 97940716..97940716 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10069-UNI-1980.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10069-UNI-1980.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10070-UNI-1981.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10070-UNI-1981.cpp
index d4f74dc3..d4f74dc3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10070-UNI-1981.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10070-UNI-1981.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10071-UNI-1983.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10071-UNI-1983.cpp
index e7d9de6d..e7d9de6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10071-UNI-1983.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10071-UNI-1983.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10079-UNI-9650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10079-UNI-9650.cpp
index 0d6cdb46..0d6cdb46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10079-UNI-9650.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10079-UNI-9650.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10080-UNI-10496.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10080-UNI-10496.cpp
index 81122be8..81122be8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10080-UNI-10496.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10080-UNI-10496.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10100-issue_564.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10100-issue_564.cpp
index ac5fbef3..ac5fbef3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10100-issue_564.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10100-issue_564.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10101-issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10101-issue_574.cpp
index 6621d455..6621d455 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10101-issue_574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10101-issue_574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10102-issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10102-issue_574.cpp
index 0f3b7da3..0f3b7da3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10102-issue_574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10102-issue_574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10103-issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10103-issue_574.cpp
index b87e76fe..b87e76fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10103-issue_574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10103-issue_574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10566-issue_1752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10566-issue_1752.cpp
index 8e16cfa3..8e16cfa3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/10566-issue_1752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/10566-issue_1752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/11000-UNI-12046.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/11000-UNI-12046.cpp
index 5ffc0da9..5ffc0da9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/11000-UNI-12046.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/11000-UNI-12046.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/20002-UNI-32657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/20002-UNI-32657.cpp
index eb7655da..eb7655da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/20002-UNI-32657.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/20002-UNI-32657.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/20011-UNI-38381.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/20011-UNI-38381.cpp
index 701b55b2..701b55b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/20011-UNI-38381.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/20011-UNI-38381.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30000-cout.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30000-cout.cpp
index f099751f..f099751f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30000-cout.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30000-cout.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30001-alt_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30001-alt_tokens.cpp
index 02083b88..02083b88 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30001-alt_tokens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30001-alt_tokens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30002-constructor.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30002-constructor.cpp
index f7cbb30d..f7cbb30d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30002-constructor.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30002-constructor.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30003-strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30003-strings.cpp
index acef8744..acef8744 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30003-strings.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30003-strings.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30004-Issue_4036.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30004-Issue_4036.cpp
new file mode 100644
index 00000000..b209c875
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30004-Issue_4036.cpp
@@ -0,0 +1,3 @@
+struct a {
+	bool b:1;
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30005-Issue_4042.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30005-Issue_4042.cpp
new file mode 100644
index 00000000..c04fbf8d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30005-Issue_4042.cpp
@@ -0,0 +1,7 @@
+union Data {
+	int val1;
+	long val2;
+	Data( ) noexcept(false )
+	: val1( 1 ) {
+	}
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30006-Issue_4027.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30006-Issue_4027.cpp
new file mode 100644
index 00000000..bd9a32d4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30006-Issue_4027.cpp
@@ -0,0 +1 @@
+#define KK2 27F30
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30007-Issue_4080.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30007-Issue_4080.cpp
new file mode 100644
index 00000000..91afa475
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30007-Issue_4080.cpp
@@ -0,0 +1,6 @@
+auto foo() -> char;
+int *x;
+int *y;
+int reset();
+int *X;
+int *Y;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30008-Issue_4094.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30008-Issue_4094.cpp
new file mode 100644
index 00000000..e8b0449a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30008-Issue_4094.cpp
@@ -0,0 +1,4 @@
+auto lambda1 = [](int x){
+	       };
+auto lambda2 = []( ){
+	       };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30009-Issue_3236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30009-Issue_3236.cpp
new file mode 100644
index 00000000..f9c100de
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30009-Issue_3236.cpp
@@ -0,0 +1,20 @@
+/* multi boolean */
+if ((va1 < 0) || (va2 > 0))
+{
+}
+
+
+/* single condition */
+if (auto val = getValue(); condition(val))
+{
+}
+
+/* multi boolean expression with existing parentheses */
+if (auto val = getValue(); (val < 0) || (val > 0))
+{
+}
+
+/* multi boolean expression without existing parentheses */
+if (auto val = getValue(); (val < 0) || (val > 0))
+{
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30010-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30010-class.h
index 2293d9c8..2293d9c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30010-class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30010-class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30011-misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30011-misc.cpp
index 9e3b8c5b..9e3b8c5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30011-misc.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30011-misc.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30012-misc2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30012-misc2.cpp
index 62a51621..62a51621 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30012-misc2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30012-misc2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30013-sim.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30013-sim.h
index 835ae666..835ae666 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30013-sim.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30013-sim.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30014-ctor-var.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30014-ctor-var.cpp
index 2551d8bd..2551d8bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30014-ctor-var.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30014-ctor-var.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30015-exception.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30015-exception.cpp
index 75a4f97e..75a4f97e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30015-exception.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30015-exception.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30016-custom-open.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30016-custom-open.cpp
index 234f5591..234f5591 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30016-custom-open.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30016-custom-open.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30017-custom-open.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30017-custom-open.cpp
index 6acd92e5..6acd92e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30017-custom-open.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30017-custom-open.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30018-class-addr.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30018-class-addr.h
index 042579dc..042579dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30018-class-addr.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30018-class-addr.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30019-wacky-template.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30019-wacky-template.cpp
index cf6e5c87..cf6e5c87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30019-wacky-template.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30019-wacky-template.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30020-bool.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30020-bool.cpp
index 9f9e55b2..9f9e55b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30020-bool.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30020-bool.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30021-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30021-byref.cpp
index 87f6c44a..87f6c44a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30021-byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30021-byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30022-extern_c.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30022-extern_c.h
index a97d93b8..a97d93b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30022-extern_c.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30022-extern_c.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30023-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30023-templates.cpp
index 960e0b82..960e0b82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30023-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30023-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30024-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30024-class-init.cpp
index 884d5c71..884d5c71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30024-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30024-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30025-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30025-class-init.cpp
index 703686ac..703686ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30025-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30025-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30026-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30026-byref.cpp
index 2534aa05..2534aa05 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30026-byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30026-byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30027-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30027-byref.cpp
index d0598697..d0598697 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30027-byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30027-byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30028-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30028-byref.cpp
index 7a97856d..7a97856d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30028-byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30028-byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30029-init_align.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30029-init_align.h
index 085f838b..085f838b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30029-init_align.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30029-init_align.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30030-Timestamp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30030-Timestamp.h
index 998b7d6f..998b7d6f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30030-Timestamp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30030-Timestamp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30031-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30031-operator.cpp
index f17b865d..f17b865d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30031-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30031-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30032-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30032-operator.cpp
index cfa98ca1..cfa98ca1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30032-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30032-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30033-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30033-operator.cpp
index 976d919f..976d919f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30033-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30033-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30034-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30034-operator_proto.cpp
index 3e5af195..3e5af195 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30034-operator_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30034-operator_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30035-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30035-operator_proto.cpp
index 3824798c..3824798c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30035-operator_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30035-operator_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30036-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30036-operator.cpp
index b1468795..b1468795 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30036-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30036-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30037-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30037-operator_proto.cpp
index d5c7e8fc..d5c7e8fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30037-operator_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30037-operator_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30038-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30038-operator.cpp
index a1bfafe3..a1bfafe3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30038-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30038-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30039-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30039-operator_proto.cpp
index 4ec0acf1..4ec0acf1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30039-operator_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30039-operator_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30040-nl-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30040-nl-class.h
index 9ccbcf75..9ccbcf75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30040-nl-class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30040-nl-class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30041-nl-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30041-nl-class.h
index 57e47625..57e47625 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30041-nl-class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30041-nl-class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30042-Issue_2020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30042-Issue_2020.cpp
index d618f922..d618f922 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30042-Issue_2020.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30042-Issue_2020.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30043-nl_func_call_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30043-nl_func_call_empty.cpp
index fbf89d16..fbf89d16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30043-nl_func_call_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30043-nl_func_call_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30044-nl_func_call_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30044-nl_func_call_paren_empty.cpp
index 4495d667..4495d667 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30044-nl_func_call_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30044-nl_func_call_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30045-nl_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30045-nl_func_decl.cpp
index 81d0a00e..81d0a00e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30045-nl_func_decl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30045-nl_func_decl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30046-nl_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30046-nl_func_decl.cpp
index 17aa59f0..17aa59f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30046-nl_func_decl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30046-nl_func_decl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp
index e8a947c9..e8a947c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30048-nl_func_def_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30048-nl_func_def_paren_empty.cpp
index 22f3c700..22f3c700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30048-nl_func_def_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30048-nl_func_def_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30049-nl_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30049-nl_func_call_paren.cpp
index 847b7037..847b7037 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30049-nl_func_call_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30049-nl_func_call_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30050-nl-namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30050-nl-namespace.h
index e515b479..e515b479 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30050-nl-namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30050-nl-namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30051-nl-namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30051-nl-namespace.h
index c51d75be..c51d75be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30051-nl-namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30051-nl-namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30052-try-catch-nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30052-try-catch-nl.cpp
index 410a735e..410a735e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30052-try-catch-nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30052-try-catch-nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30053-exception.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30053-exception.cpp
index 2c41efbf..2c41efbf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30053-exception.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30053-exception.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30054-Issue_2091.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30054-Issue_2091.cpp
index 6e32d683..6e32d683 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30054-Issue_2091.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30054-Issue_2091.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30055-nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30055-nl_func.cpp
index 142e6895..142e6895 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30055-nl_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30055-nl_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30056-nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30056-nl_func.cpp
index f930b703..f930b703 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30056-nl_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30056-nl_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30057-nl_inside_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30057-nl_inside_namespace.cpp
index 01486ebe..01486ebe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30057-nl_inside_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30057-nl_inside_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30058-nl_inside_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30058-nl_inside_namespace.cpp
index 01486ebe..01486ebe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30058-nl_inside_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30058-nl_inside_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30059-Issue_2186.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30059-Issue_2186.cpp
index 2c3081ea..2c3081ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30059-Issue_2186.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30059-Issue_2186.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30060-Issue_1734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30060-Issue_1734.cpp
index 31d08c29..31d08c29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30060-Issue_1734.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30060-Issue_1734.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30061-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30061-class-init.cpp
index 7ce41d09..7ce41d09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30061-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30061-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30062-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30062-class-init.cpp
index 53ce4a31..53ce4a31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30062-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30062-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30063-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30063-class-init.cpp
index ad278c90..ad278c90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30063-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30063-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30064-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30064-class-init.cpp
index c44bdfd3..c44bdfd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30064-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30064-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30065-Example.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30065-Example.h
index 1a868d10..1a868d10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30065-Example.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30065-Example.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30066-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30066-class-init.cpp
index 1fc8bb57..1fc8bb57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30066-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30066-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30067-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30067-nl_func_type_name.cpp
index a30a08e9..a30a08e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30067-nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30067-nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30068-nl_func_scope_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30068-nl_func_scope_name.cpp
index 1e4caa86..1e4caa86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30068-nl_func_scope_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30068-nl_func_scope_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30069-class-implementation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30069-class-implementation.cpp
index 18481338..18481338 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30069-class-implementation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30069-class-implementation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30070-nl_func_scope_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30070-nl_func_scope_name.cpp
index c14a06ed..c14a06ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30070-nl_func_scope_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30070-nl_func_scope_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30071-lineEndings-Mac.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30071-lineEndings-Mac.cpp
index 20fa083a..20fa083a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30071-lineEndings-Mac.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30071-lineEndings-Mac.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30072-lineEndings-Win.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30072-lineEndings-Win.cpp
index cdbf7653..cdbf7653 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30072-lineEndings-Win.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30072-lineEndings-Win.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30073-lineEndings-Unix.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30073-lineEndings-Unix.cpp
index 608952c0..608952c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30073-lineEndings-Unix.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30073-lineEndings-Unix.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30074-bom.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30074-bom.cpp
index 7ee7e7e6..7ee7e7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30074-bom.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30074-bom.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30075-goto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30075-goto.cpp
index 4cccfe2c..4cccfe2c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30075-goto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30075-goto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30076-Issue_2594.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30076-Issue_2594.cpp
index 240e19db..240e19db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30076-Issue_2594.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30076-Issue_2594.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30077-Issue_2596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30077-Issue_2596.cpp
index d2517e8b..d2517e8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30077-Issue_2596.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30077-Issue_2596.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30078-Issue_2672-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30078-Issue_2672-a.cpp
index d29d2c47..d29d2c47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30078-Issue_2672-a.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30078-Issue_2672-a.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30079-Issue_2672-b.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30079-Issue_2672-b.cpp
index f484d4ff..f484d4ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30079-Issue_2672-b.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30079-Issue_2672-b.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30080-nl_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30080-nl_brace_brace.cpp
index a9783697..a9783697 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30080-nl_brace_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30080-nl_brace_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30081-Issue_2383.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30081-Issue_2383.cpp
index 356fd9af..356fd9af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30081-Issue_2383.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30081-Issue_2383.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30082-Issue_931.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30082-Issue_931.cpp
index 76a6b856..76a6b856 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30082-Issue_931.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30082-Issue_931.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30083-Issue_995-do.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30083-Issue_995-do.cpp
index 2e84d7ce..2e84d7ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30083-Issue_995-do.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30083-Issue_995-do.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30084-Issue_1184.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30084-Issue_1184.cpp
index 848b1e03..848b1e03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30084-Issue_1184.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30084-Issue_1184.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30085-align_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30085-align_class.cpp
index 552d6947..552d6947 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30085-align_class.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30085-align_class.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30086-align_class-constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30086-align_class-constr.cpp
index f6082028..f6082028 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30086-align_class-constr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30086-align_class-constr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30087-Issue_1511.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30087-Issue_1511.cpp
index 2583c0e3..2583c0e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30087-Issue_1511.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30087-Issue_1511.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30088-Issue_2561.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30088-Issue_2561.cpp
index aa566966..aa566966 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30088-Issue_2561.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30088-Issue_2561.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30089-Issue_2281.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30089-Issue_2281.cpp
index e0d8727d..e0d8727d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30089-Issue_2281.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30089-Issue_2281.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30090-bug_488.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30090-bug_488.cpp
index 268d5ba4..268d5ba4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30090-bug_488.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30090-bug_488.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30091-bug_472.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30091-bug_472.cpp
index e48251fe..e48251fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30091-bug_472.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30091-bug_472.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30092-bug_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30092-bug_481.cpp
index 99d8c390..99d8c390 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30092-bug_481.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30092-bug_481.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30093-bug_484.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30093-bug_484.cpp
index 875ff3d2..875ff3d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30093-bug_484.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30093-bug_484.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30094-bug_495.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30094-bug_495.cpp
index d7db1238..d7db1238 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30094-bug_495.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30094-bug_495.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30095-bug_485.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30095-bug_485.cpp
index b5e7842c..b5e7842c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30095-bug_485.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30095-bug_485.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30096-bug_1854.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30096-bug_1854.cpp
index 29cc2774..29cc2774 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30096-bug_1854.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30096-bug_1854.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30097-issue_1946.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30097-issue_1946.cpp
index 9682da68..9682da68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30097-issue_1946.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30097-issue_1946.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30098-Issue_2692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30098-Issue_2692.cpp
index 4173ad5d..4173ad5d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30098-Issue_2692.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30098-Issue_2692.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30099-bug_1127.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30099-bug_1127.cpp
index 0109baaf..0109baaf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30099-bug_1127.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30099-bug_1127.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30100-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30100-templates.cpp
index e4dd89e5..e4dd89e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30100-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30100-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30101-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30101-templates.cpp
index 78a60ebd..78a60ebd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30101-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30101-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30102-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30102-templates.cpp
index 86bbfaf7..86bbfaf7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30102-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30102-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30103-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30103-templates.cpp
index adadb882..adadb882 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30103-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30103-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30104-templ_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30104-templ_class.h
index 802f7e27..802f7e27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30104-templ_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30104-templ_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30105-av.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30105-av.h
index 6efe8e9b..6efe8e9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30105-av.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30105-av.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30106-templates2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30106-templates2.cpp
index 48f56d99..48f56d99 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30106-templates2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30106-templates2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30107-templates2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30107-templates2.cpp
index a49d4381..a49d4381 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30107-templates2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30107-templates2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30108-templates3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30108-templates3.cpp
index a0e20d19..a0e20d19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30108-templates3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30108-templates3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30109-templates4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30109-templates4.cpp
index 781822e8..781822e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30109-templates4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30109-templates4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30110-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30110-class-init.cpp
index e1b1949c..e1b1949c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30110-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30110-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30111-bug_1346.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30111-bug_1346.h
index 2ca31e50..2ca31e50 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30111-bug_1346.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30111-bug_1346.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30112-bug_1432.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30112-bug_1432.cpp
index 575a21c8..575a21c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30112-bug_1432.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30112-bug_1432.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30113-bug_1452.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30113-bug_1452.cpp
index 59a3babd..59a3babd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30113-bug_1452.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30113-bug_1452.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30114-bug_1462.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30114-bug_1462.cpp
index b6a33ceb..b6a33ceb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30114-bug_1462.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30114-bug_1462.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30115-Issue_1704.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30115-Issue_1704.cpp
index 90cb2049..90cb2049 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30115-Issue_1704.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30115-Issue_1704.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30116-Issue_1052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30116-Issue_1052.cpp
index 0e21f136..0e21f136 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30116-Issue_1052.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30116-Issue_1052.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30117-Issue_2343.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30117-Issue_2343.cpp
index a82e1172..a82e1172 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30117-Issue_2343.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30117-Issue_2343.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30118-Issue_2758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30118-Issue_2758.cpp
index 576b1bef..576b1bef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30118-Issue_2758.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30118-Issue_2758.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30119-Issue_2879.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30119-Issue_2879.cpp
index fbc323ae..fbc323ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30119-Issue_2879.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30119-Issue_2879.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30120-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30120-sp_after_angle.cpp
index 04af5289..04af5289 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30120-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30120-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30121-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30121-sp_after_angle.cpp
index 8764578e..8764578e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30121-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30121-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30122-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30122-sp_after_angle.cpp
index ee7acae0..ee7acae0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30122-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30122-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30123-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30123-sp_after_angle.cpp
index a791a8ef..a791a8ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30123-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30123-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30124-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30124-sp_after_angle.cpp
index c29f3552..c29f3552 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30124-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30124-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30125-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30125-sp_after_angle.cpp
index a791a8ef..a791a8ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30125-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30125-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30126-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30126-sp_after_angle.cpp
index 18788919..18788919 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30126-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30126-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30127-Issue_2565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30127-Issue_2565.cpp
index 721d4d78..721d4d78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30127-Issue_2565.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30127-Issue_2565.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30128-Issue_2873.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30128-Issue_2873.cpp
index 6803fd9a..6803fd9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30128-Issue_2873.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30128-Issue_2873.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30129-Issue_2890.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30129-Issue_2890.cpp
index d03e4f62..d03e4f62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30129-Issue_2890.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30129-Issue_2890.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30130-if-constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30130-if-constexpr.cpp
index 483317be..483317be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30130-if-constexpr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30130-if-constexpr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30131-Issue_3010.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30131-Issue_3010.cpp
index 93fd70db..93fd70db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30131-Issue_3010.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30131-Issue_3010.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30132-sp_brace_catch.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30132-sp_brace_catch.cpp
index 04c1b9c1..04c1b9c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30132-sp_brace_catch.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30132-sp_brace_catch.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30133-Issue_3252.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30133-Issue_3252.cpp
index 5dc0e67e..5dc0e67e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30133-Issue_3252.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30133-Issue_3252.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30134-Issue_3357.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30134-Issue_3357.cpp
index 83dcc29a..83dcc29a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30134-Issue_3357.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30134-Issue_3357.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30135-Issue_3448.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30135-Issue_3448.cpp
index 19160cf9..19160cf9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30135-Issue_3448.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30135-Issue_3448.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30136-Issue_3413.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30136-Issue_3413.cpp
index d465f531..d465f531 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30136-Issue_3413.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30136-Issue_3413.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30137-Issue_3513-0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30137-Issue_3513-0.cpp
index c55df54a..c55df54a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30137-Issue_3513-0.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30137-Issue_3513-0.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30138-Issue_3513-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30138-Issue_3513-1.cpp
index 560e6d51..560e6d51 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30138-Issue_3513-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30138-Issue_3513-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30139-Issue_3604.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30139-Issue_3604.cpp
index a96b3437..a96b3437 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30139-Issue_3604.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30139-Issue_3604.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30140-Issue_3785.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30140-Issue_3785.cpp
index 94988dd6..94988dd6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30140-Issue_3785.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30140-Issue_3785.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30141-Issue_1130.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30141-Issue_1130.cpp
new file mode 100644
index 00000000..bd2e995a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30141-Issue_1130.cpp
@@ -0,0 +1,39 @@
+void ABC()
+{
+        bool bb = true;
+        bool ccc = true;
+        char x;
+// simple: E1 ? E2 : E3
+        x =
+                bb  ?
+                'T'
+                    : 'F';
+// simple_R: E1 ? E2 : E1r ? E2r : E3r
+        x =
+                bb  ?
+                'T'
+                    : ccc ?
+                'r'
+                          : 'F';
+simple_L: E1 ? E1l ? E2l : E3l : E3
+        x =
+                bb  ?
+                (ccc) ?
+                't'
+                      : 'l'
+                    : 'F';
+// CDanU E1 ? E1l ? E2ll : E1ll ? E3ll : E3l : E3
+        x =
+                (bb) ?
+                (is_newline_tmp) ? 'n'
+                                 : (is_comment_tmp) ? 'c'
+                                                    : 'o'
+                     : '-';
+
+
+//CDanU E1 ?  E1l              ? E2ll : E1ll              ? E3ll : E3l : E3
+// x = (y) ?  _is_newline(tmp) ? 'n'  :  _is_comment(tmp) ? 'c'  : 'o' : '-';
+//                                     |E1______________ c E2_ C E3_|
+//           |E1______________ b E2_ B E3___________________________|
+//    |E1_ a E2_____________________________________________________ A E3|
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30142-Issue_3915.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30142-Issue_3915.cpp
new file mode 100644
index 00000000..4bf41212
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30142-Issue_3915.cpp
@@ -0,0 +1,9 @@
+void
+foo(Foo const & f)
+{
+	auto bar = Bar(f);
+	if (bar.something) {
+		assert(bar.something_else == 1);
+	}
+}
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30143-Issue_3919.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30143-Issue_3919.cpp
new file mode 100644
index 00000000..4d2fa153
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30143-Issue_3919.cpp
@@ -0,0 +1,5 @@
+void Test
+{
+	// <-- Here we want a space after //
+	DoSomething(); //-V612 : warning #612 disabled.
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30144-Issue_3916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30144-Issue_3916.cpp
new file mode 100644
index 00000000..aa1d0737
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30144-Issue_3916.cpp
@@ -0,0 +1,29 @@
+#include <string>
+
+using TEnglishString = std::string;
+
+class CComCommandInfo
+{
+public:
+CComCommandInfo( TEnglishString, TEnglishString );
+};
+
+template< typename T >
+class CGenericCommandEx
+{
+public:
+CGenericCommandEx( T );
+};
+
+
+template< typename T >
+void Test( TEnglishString commandName_, TEnglishString commandDescription_, T functor_ )
+{
+        CComCommandInfo cmdInfo( std::forward< TEnglishString >( commandName_ ),
+                                 std::forward< TEnglishString >( commandDescription_ ) );
+
+        auto* pCommand =
+                new CGenericCommandEx(
+                        std::forward< decltype( functor_ ) >( functor_ ) ); // <--- Note the extra spaces added here
+}
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30145-Issue_3914.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30145-Issue_3914.cpp
new file mode 100644
index 00000000..716b20aa
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30145-Issue_3914.cpp
@@ -0,0 +1,8 @@
+void foo()
+{
+	desc->add_options( )
+	( "help,h", "produce help message" )
+	( "version,v", "print the version number" )
+	( "include-path,I", value< vector<string> >( ), "include path" )
+	( "input-file,i", value<string>( ), "input file" );
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30146-Issue_3614.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30146-Issue_3614.cpp
new file mode 100644
index 00000000..bd313666
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30146-Issue_3614.cpp
@@ -0,0 +1,2 @@
+// bla
+//lint {...}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30147-Issue_3965.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30147-Issue_3965.cpp
new file mode 100644
index 00000000..50e66983
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30147-Issue_3965.cpp
@@ -0,0 +1,4 @@
+void Win::fill()
+{
+    product->addItem(product.name + "%1");
+}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30148-Issue_3965-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30148-Issue_3965-2.cpp
new file mode 100644
index 00000000..c914bc68
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30148-Issue_3965-2.cpp
@@ -0,0 +1,7 @@
+void Win::check(QString id)
+{
+    if(names.contains(id + QString("_tst")) or names.contains(id + QString("_prd"))) {
+	true;
+    }
+    return;
+}
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30149-Issue_3967.cc b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30149-Issue_3967.cc
new file mode 100644
index 00000000..84b393a2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30149-Issue_3967.cc
@@ -0,0 +1,4 @@
+std::ostream& xx::operator<<(std::ostream& os, xx::Exception const& ex)
+{
+    return os;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30150-Issue_3983.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30150-Issue_3983.cpp
new file mode 100644
index 00000000..f35629ab
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30150-Issue_3983.cpp
@@ -0,0 +1,9 @@
+#include <iostream>
+struct s {int i;};
+
+int main()
+{
+	struct s x;
+	x.i = 5;
+	std::cout << x.i << std::endl;
+}       // main
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30151-Issue_3996.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30151-Issue_3996.cpp
new file mode 100644
index 00000000..b8680b9e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30151-Issue_3996.cpp
@@ -0,0 +1,28 @@
+#include <iostream>
+
+class OtherClass
+{
+public:
+int i;
+OtherClass() : i(5) {
+}
+OtherClass* self() {
+	return this;
+}
+};
+
+class MyClass
+{
+public:
+OtherClass x;
+int getI();
+};
+
+int MyClass::getI() {
+	return this->x.self()->i;
+}
+
+int main() {
+	MyClass c;
+	std::cout << c.getI() << std::endl;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30152-Issue_4023.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30152-Issue_4023.cpp
new file mode 100644
index 00000000..718ae2fb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30152-Issue_4023.cpp
@@ -0,0 +1,22 @@
+class foo {
+public:
+bool var;
+
+foo(bool x) {
+	var = x;
+}
+
+bool get()
+{
+	return var;
+}
+};
+
+
+int main() {
+	foo f(false);
+
+	const int b = true ? 2 : 3;
+
+	const int a = !f.get() ? 2 : 3;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30153-Issue_4026.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30153-Issue_4026.cpp
new file mode 100644
index 00000000..79d31b18
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30153-Issue_4026.cpp
@@ -0,0 +1,52 @@
+class foo {
+public:
+int var;
+
+foo(int x) {
+	var = x;
+}
+};
+
+int main()
+{
+	int a = 2;
+	a++;
+
+	foo f(3);
+	f.var++;
+}
+
+InternalFunctionImp::InternalFunctionImp(ExecState *exec)
+	: ObjectImp(static_cast<FunctionPrototypeImp*>(exec->interpreter()->builtinFunctionPrototype().imp()))
+{
+	for (int z=0; z<count; z++)
+	{
+		TQString hlName = KateFactory::self()->schemaManager()->list().operator[](z);
+
+		if (names.contains(hlName) < 1)
+		{
+			names << hlName;
+			popupMenu()->insertItem ( hlName, this, TQT_SLOT(setSchema(int)), 0,  z+1);
+		}
+	}
+
+	struct sockaddr_in *sin1 = (sockaddr_in *) s1.address();
+	struct sockaddr_in *sin2 = (sockaddr_in *) s2.address();
+
+	if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
+	{
+		tqWarning("[dcopserver] Corrupt data!");
+		printf("[dcopserver] bytesLeft: %d, len: %d", bytesLeft, len);
+		return result;
+	}
+	result.TQByteArray::resize( (uint)len );
+
+	if (pbar->isVisible() && pbar->isEnabled() &&
+	    pbar->progress() != pbar->totalSteps())
+	{
+		++iter.data();
+		if (iter.data() == 28)
+			iter.data() = 0;
+		iter.key()->update();
+	}
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30154-Issue_4132.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30154-Issue_4132.cpp
new file mode 100644
index 00000000..256db54c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30154-Issue_4132.cpp
@@ -0,0 +1 @@
+using stdsize = typename _arch_helper< (int)sizeof(void*) >::sz_t;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30160-Issue_3980.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30160-Issue_3980.cpp
new file mode 100644
index 00000000..89d43dfe
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30160-Issue_3980.cpp
@@ -0,0 +1,5 @@
+int a = 4I8;
+int b = 4I16;
+int c = 4I32;
+int d = 4I64;
+int e = 4I128;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30161-Discussion_3987.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30161-Discussion_3987.cpp
new file mode 100644
index 00000000..7ac8e131
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30161-Discussion_3987.cpp
@@ -0,0 +1,5 @@
+static void append_tag_name(UncText &txt, Chunk *pc)
+{
+	LOG_FUNC_ENTRY();
+	Chunk *tmp = pc->GetPrevNcNnl();
+} /* append_tag_name */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30162-Issue_4239.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30162-Issue_4239.cpp
new file mode 100644
index 00000000..a725a5b0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30162-Issue_4239.cpp
@@ -0,0 +1,10 @@
+void f()
+{
+        int x;
+        int y;
+        y = x;
+        if ((y = x) != 0)
+                for (;;)
+                        if (x)
+                                return;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30200-bug_1862.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30200-bug_1862.cpp
index c5357c86..c5357c86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30200-bug_1862.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30200-bug_1862.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30201-cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30201-cmt_indent.cpp
index ed27ffca..ed27ffca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30201-cmt_indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30201-cmt_indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30202-cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30202-cmt_indent.cpp
index 95c47d6e..95c47d6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30202-cmt_indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30202-cmt_indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30203-cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30203-cmt_indent.cpp
index 05cc2df3..05cc2df3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30203-cmt_indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30203-cmt_indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30204-comment-align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30204-comment-align.cpp
index afaaafef..afaaafef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30204-comment-align.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30204-comment-align.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30205-cmt_right.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30205-cmt_right.cpp
index bcca4e2e..bcca4e2e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30205-cmt_right.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30205-cmt_right.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp
index d020e171..d020e171 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30207-cmt_indent_pp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30207-cmt_indent_pp.h
index 50e35c8d..50e35c8d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30207-cmt_indent_pp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30207-cmt_indent_pp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30208-bug_1108.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30208-bug_1108.cpp
index 573a9810..573a9810 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30208-bug_1108.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30208-bug_1108.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30209-bug_1134.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30209-bug_1134.cpp
index 369b70f1..369b70f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30209-bug_1134.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30209-bug_1134.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30210-bug_1338.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30210-bug_1338.cpp
index 04b4cd8a..04b4cd8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30210-bug_1338.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30210-bug_1338.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp
index 34c09203..34c09203 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp
index f9316598..f9316598 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30213-align_right_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30213-align_right_comment.cpp
index 43a2a70f..43a2a70f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30213-align_right_comment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30213-align_right_comment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30214-align_across_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30214-align_across_braces.cpp
index 199ede8d..199ede8d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30214-align_across_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30214-align_across_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30215-Issue_2099.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30215-Issue_2099.cpp
index 4726f44b..4726f44b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30215-Issue_2099.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30215-Issue_2099.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30216-Issue_2302.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30216-Issue_2302.cpp
index e2684ae6..e2684ae6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30216-Issue_2302.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30216-Issue_2302.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30217-2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30217-2138.cpp
index 8d1d7462..8d1d7462 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30217-2138.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30217-2138.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30218-Issue_3710.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30218-Issue_3710.cpp
index b8e5b421..b8e5b421 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30218-Issue_3710.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30218-Issue_3710.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30220-bug_1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30220-bug_1340.cpp
index f64bc6a0..f64bc6a0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30220-bug_1340.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30220-bug_1340.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30221-Issue_2914.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30221-Issue_2914.cpp
index c2cd8b59..c2cd8b59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30221-Issue_2914.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30221-Issue_2914.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30223-sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30223-sp_enum_colon.cpp
index 11d7320b..11d7320b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30223-sp_enum_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30223-sp_enum_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30224-sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30224-sp_enum_colon.cpp
index 804fe1ae..804fe1ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30224-sp_enum_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30224-sp_enum_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30225-Issue_3176.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30225-Issue_3176.cpp
index 2384027d..2384027d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30225-Issue_3176.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30225-Issue_3176.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30226-sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30226-sp_enum_colon.cpp
index be23e687..be23e687 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30226-sp_enum_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30226-sp_enum_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30227-sp_inside_braces_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30227-sp_inside_braces_enum.cpp
index 8386e215..8386e215 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30227-sp_inside_braces_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30227-sp_inside_braces_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30228-sp_inside_braces_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30228-sp_inside_braces_enum.cpp
index 666f834c..666f834c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30228-sp_inside_braces_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30228-sp_inside_braces_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30229-sp_inside_braces_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30229-sp_inside_braces_enum.cpp
index 98640667..98640667 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30229-sp_inside_braces_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30229-sp_inside_braces_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30230-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30230-sp_type_func.cpp
index 0d17364f..0d17364f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30230-sp_type_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30230-sp_type_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30231-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30231-sp_type_func.cpp
index d7d69cc8..d7d69cc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30231-sp_type_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30231-sp_type_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30232-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30232-sp_type_func.cpp
index fe2a3348..fe2a3348 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30232-sp_type_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30232-sp_type_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30233-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30233-sp_type_func.cpp
index fe2a3348..fe2a3348 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30233-sp_type_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30233-sp_type_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30234-functype_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30234-functype_param.cpp
index 32419616..32419616 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30234-functype_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30234-functype_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30235-functype_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30235-functype_param.cpp
index 9e9f5ecc..9e9f5ecc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30235-functype_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30235-functype_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30236-Issue_750.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30236-Issue_750.cpp
index bf7d1100..bf7d1100 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30236-Issue_750.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30236-Issue_750.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30237-Issue_3920.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30237-Issue_3920.cpp
new file mode 100644
index 00000000..aa5511e6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30237-Issue_3920.cpp
@@ -0,0 +1,4 @@
+std::string StrGet()
+{
+	return IsConnected() ? "Connected" : {};
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30240-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30240-align_func_params.cpp
index 923d274b..923d274b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30240-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30240-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30241-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30241-align_func_params.cpp
index 923d274b..923d274b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30241-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30241-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30242-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30242-align_func_params.cpp
index 512233cd..512233cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30242-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30242-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30243-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30243-align_func_params.cpp
index 82434066..82434066 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30243-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30243-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30244-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30244-align_func_params.cpp
index 5efed666..5efed666 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30244-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30244-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30245-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30245-align_func_params.cpp
index a44170a9..a44170a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30245-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30245-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30246-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30246-align_func_params.cpp
index 9def11e6..9def11e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30246-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30246-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30247-Issue_2332.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30247-Issue_2332.cpp
index 0bc9cf8f..0bc9cf8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30247-Issue_2332.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30247-Issue_2332.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30248-Issue_2831.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30248-Issue_2831.cpp
index c099567a..c099567a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30248-Issue_2831.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30248-Issue_2831.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30249-align-330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30249-align-330.cpp
index a92e1545..a92e1545 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30249-align-330.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30249-align-330.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30250-align_fcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30250-align_fcall.cpp
index 055f0029..055f0029 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30250-align_fcall.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30250-align_fcall.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30251-align_fcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30251-align_fcall.cpp
index 055f0029..055f0029 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30251-align_fcall.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30251-align_fcall.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30252-Issue_3691.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30252-Issue_3691.h
index fb1ec761..fb1ec761 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30252-Issue_3691.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30252-Issue_3691.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30253-align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30253-align_left_shift.cpp
index 7c98226d..7c98226d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30253-align_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30253-align_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30254-align_left_shift2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30254-align_left_shift2.cpp
index bfea744c..bfea744c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30254-align_left_shift2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30254-align_left_shift2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30255-align_constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30255-align_constr.cpp
index 380f0c8b..380f0c8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30255-align_constr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30255-align_constr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30256-func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30256-func_call.cpp
index e3eff88c..e3eff88c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30256-func_call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30256-func_call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30257-func_call_chain.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30257-func_call_chain.cpp
index 7e2f3931..7e2f3931 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30257-func_call_chain.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30257-func_call_chain.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30258-casts.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30258-casts.cpp
index d8a496fb..d8a496fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30258-casts.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30258-casts.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp
index 7b63b639..7b63b639 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30260-var_def_gap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30260-var_def_gap.cpp
index 7333d292..7333d292 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30260-var_def_gap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30260-var_def_gap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30261-align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30261-align_var_def_thresh.cpp
index 8512377e..8512377e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30261-align_var_def_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30261-align_var_def_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30262-align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30262-align_var_def_thresh.cpp
index 4996a3d3..4996a3d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30262-align_var_def_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30262-align_var_def_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30263-align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30263-align_var_def_thresh.cpp
index 1e10f370..1e10f370 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30263-align_var_def_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30263-align_var_def_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30264-Issue_2668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30264-Issue_2668.cpp
index da8e118f..da8e118f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30264-Issue_2668.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30264-Issue_2668.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30265-long_br_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30265-long_br_cmt.cpp
index 8ebdcec9..8ebdcec9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30265-long_br_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30265-long_br_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30266-Issue_2921.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30266-Issue_2921.cpp
index 53e3c495..53e3c495 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30266-Issue_2921.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30266-Issue_2921.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30267-Issue_2930.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30267-Issue_2930.cpp
index 00cff53b..00cff53b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30267-Issue_2930.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30267-Issue_2930.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30268-Issue_3018.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30268-Issue_3018.cpp
index ddbb473e..ddbb473e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30268-Issue_3018.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30268-Issue_3018.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30270-const_throw.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30270-const_throw.cpp
index 44f0ca68..44f0ca68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30270-const_throw.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30270-const_throw.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30271-sp_throw_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30271-sp_throw_paren.cpp
index 21ce9291..21ce9291 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30271-sp_throw_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30271-sp_throw_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30272-sp_throw_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30272-sp_throw_paren.cpp
index ea851aff..ea851aff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30272-sp_throw_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30272-sp_throw_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp
index ee0d705b..ee0d705b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp
index 93cc7f86..93cc7f86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30275-bug_1321.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30275-bug_1321.cpp
index 5e708c11..5e708c11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30275-bug_1321.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30275-bug_1321.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30278-bug_1439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30278-bug_1439.cpp
index d560522b..d560522b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30278-bug_1439.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30278-bug_1439.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp
index 80456e65..80456e65 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30280-sf557.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30280-sf557.cpp
index 287bc9c1..287bc9c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30280-sf557.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30280-sf557.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30281-Issue_2478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30281-Issue_2478.cpp
index 40674590..40674590 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30281-Issue_2478.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30281-Issue_2478.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30282-Issue_2703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30282-Issue_2703.cpp
index ec4554e9..ec4554e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30282-Issue_2703.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30282-Issue_2703.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30283-Issue_3321.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30283-Issue_3321.h
index 9444d24c..9444d24c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30283-Issue_3321.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30283-Issue_3321.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30284-Issue_2957.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30284-Issue_2957.cpp
index bd52cb8c..bd52cb8c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30284-Issue_2957.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30284-Issue_2957.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30285-Issue_2971.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30285-Issue_2971.cpp
index 52e7a253..52e7a253 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30285-Issue_2971.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30285-Issue_2971.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30286-Issue_3558.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30286-Issue_3558.cpp
index 561821ee..561821ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30286-Issue_3558.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30286-Issue_3558.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30287-Issue_3786.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30287-Issue_3786.cpp
index dfb53cdc..dfb53cdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30287-Issue_3786.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30287-Issue_3786.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30287-Issue_3786.rerun.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30287-Issue_3786.rerun.cpp
index 41ebe641..41ebe641 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30287-Issue_3786.rerun.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30287-Issue_3786.rerun.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30290-align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30290-align_left_shift.cpp
index 8591a642..8591a642 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30290-align_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30290-align_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30291-indent_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30291-indent_shift.cpp
index bc1ae2e5..bc1ae2e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30291-indent_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30291-indent_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30292-eigen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30292-eigen.cpp
index aa43434a..aa43434a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30292-eigen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30292-eigen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30293-pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30293-pos_shift.cpp
index d4a8f1ed..d4a8f1ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30293-pos_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30293-pos_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30294-pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30294-pos_shift.cpp
index badc9798..badc9798 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30294-pos_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30294-pos_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30295-pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30295-pos_shift.cpp
index efb19263..efb19263 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30295-pos_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30295-pos_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30300-enum_shr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30300-enum_shr.cpp
index 26e0d08e..26e0d08e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30300-enum_shr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30300-enum_shr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30301-enum_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30301-enum_class.h
index 7ad5e9ea..7ad5e9ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30301-enum_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30301-enum_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30302-bug_1315.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30302-bug_1315.cpp
index 584f9a00..584f9a00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30302-bug_1315.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30302-bug_1315.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30303-Issue_2902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30303-Issue_2902.cpp
index ae10d5a9..ae10d5a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30303-Issue_2902.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30303-Issue_2902.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30310-braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30310-braced_init_list.cpp
index 116462c2..116462c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30310-braced_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30310-braced_init_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30311-uniform_initialization.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30311-uniform_initialization.cpp
index 64da585d..64da585d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30311-uniform_initialization.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30311-uniform_initialization.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30312-return_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30312-return_init_list.cpp
index ef91c528..ef91c528 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30312-return_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30312-return_init_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30313-sp_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30313-sp_brace_brace.cpp
index 2ae91737..2ae91737 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30313-sp_brace_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30313-sp_brace_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30314-sp_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30314-sp_brace_brace.cpp
index b7ca9839..b7ca9839 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30314-sp_brace_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30314-sp_brace_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30315-return_braced_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30315-return_braced_init.cpp
index cf86baeb..cf86baeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30315-return_braced_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30315-return_braced_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30316-Issue_2428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30316-Issue_2428.cpp
index b2a0a139..b2a0a139 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30316-Issue_2428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30316-Issue_2428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp
index 3c22d790..3c22d790 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30318-Issue_2949.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30318-Issue_2949.cpp
index d37d7ac3..d37d7ac3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30318-Issue_2949.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30318-Issue_2949.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30319-Issue_2886.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30319-Issue_2886.cpp
index 0474c710..0474c710 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30319-Issue_2886.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30319-Issue_2886.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30320-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30320-returns.cpp
index d1ac08c0..d1ac08c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30320-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30320-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30321-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30321-returns.cpp
index 1abe1e54..1abe1e54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30321-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30321-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30322-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30322-returns.cpp
index a61b0fcf..a61b0fcf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30322-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30322-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30323-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30323-returns.cpp
index b12cd7eb..b12cd7eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30323-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30323-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30324-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30324-returns.cpp
index fede22db..fede22db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30324-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30324-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30325-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30325-returns.cpp
index d797f9c7..d797f9c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30325-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30325-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30326-indent_off_after_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30326-indent_off_after_return.cpp
index 6cd6d8e4..6cd6d8e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30326-indent_off_after_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30326-indent_off_after_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30327-indent_off_after_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30327-indent_off_after_return.cpp
index 6cd6d8e4..6cd6d8e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30327-indent_off_after_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30327-indent_off_after_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30328-call_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30328-call_brace_init_lst.cpp
index b75c35b1..b75c35b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30328-call_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30328-call_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30329-call_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30329-call_brace_init_lst.cpp
index 83837910..83837910 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30329-call_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30329-call_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30330-Issue_3080.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30330-Issue_3080.cpp
index 75c6072b..75c6072b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30330-Issue_3080.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30330-Issue_3080.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30340-issue_3105_1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30340-issue_3105_1.cpp
new file mode 100644
index 00000000..3e9e4799
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30340-issue_3105_1.cpp
@@ -0,0 +1,14 @@
+int short_function_name()
+{
+	call_some_really_long_function.of_some_sort(
+	       some_long_parameter1, some_long_parameter2);
+
+	void *test_func = library->symbol( TQString(TQString(
+	       "test_%1").arg(module2.factoryName())).utf8() );
+
+	CHECK_COMPLETE_SIZE (iceConn, ICE_AuthNextPhase, length,
+	       message->authDataLength +
+	       SIZEOF (iceAuthNextPhaseMsg), authData,
+	       iceConn->connect_to_you ? IceFatalToConnection :
+	       IceFatalToProtocol);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30341-issue_3105_1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30341-issue_3105_1.cpp
new file mode 100644
index 00000000..d79c00c6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30341-issue_3105_1.cpp
@@ -0,0 +1,15 @@
+int short_function_name()
+{
+	call_some_really_long_function.of_some_sort(
+		some_long_parameter1, some_long_parameter2);
+
+	void *test_func =
+	     library->symbol( TQString(TQString("test_%1").arg(
+							module2.factoryName())).utf8() );
+
+	CHECK_COMPLETE_SIZE (iceConn, ICE_AuthNextPhase, length,
+	     message->authDataLength +
+	     SIZEOF (iceAuthNextPhaseMsg), authData,
+	     iceConn->connect_to_you ? IceFatalToConnection :
+	     IceFatalToProtocol);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30342-issue_3105_1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30342-issue_3105_1.cpp
new file mode 100644
index 00000000..81bb1f61
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30342-issue_3105_1.cpp
@@ -0,0 +1,17 @@
+int short_function_name()
+{
+	call_some_really_long_function.of_some_sort(
+		some_long_parameter1, some_long_parameter2);
+
+	void *test_func =
+		library->symbol( TQString(TQString("test_%1").arg(
+																module2.factoryName())).utf8() );
+
+	CHECK_COMPLETE_SIZE (iceConn, ICE_AuthNextPhase, length,
+	                     message->authDataLength +
+	                     SIZEOF (iceAuthNextPhaseMsg),
+	                     authData,
+	                     iceConn->connect_to_you ?
+	                     IceFatalToConnection :
+	                     IceFatalToProtocol);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30343-issue_3105_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30343-issue_3105_2.cpp
new file mode 100644
index 00000000..9e6b6d78
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30343-issue_3105_2.cpp
@@ -0,0 +1,94 @@
+struct KPluginSelectionWidget::KPluginSelectionWidgetPrivate
+{
+	KPluginSelectionWidgetPrivate(KPluginSelector *_kps, const TQString &_cat,
+	        TDEConfigGroup *_config) :
+			widgetstack(0), kps(_kps), config(_config), tooltip(0), catname(_cat), currentplugininfo(0),
+			        visible(true), currentchecked(false), changed(0)
+	{
+		moduleParentComponents.setAutoDelete(true);
+	}
+};
+
+KPasswordDialog::KPasswordDialog(Types type, bool enableKeep, int extraBttn, TQWidget *parent,
+        const char *name) :
+		KDialogBase(parent, name, true, "", Ok | Cancel | extraBttn,
+		        Ok, true), m_Keep(enableKeep ? 1 : 0), m_Type(type), m_keepWarnLbl(0),
+		        d(new KPasswordDialogPrivate)
+{
+	d->iconName = "password";
+	init();
+
+	const TQString strengthBarWhatsThis(i18n(
+	        "The password strength meter gives an indication of the security "
+	        "of the password you have entered.  To improve the strength of "
+	        "the password, try:\n"
+	        " - using a longer password;\n"
+	        " - using a mixture of upper- and lower-case letters;\n"
+	        " - using numbers or symbols, such as #, as well as letters."));
+
+	int retVal = KMessageBox::warningContinueCancel(this,
+	        i18n("The password you have entered has a low strength. "
+	             "To improve the strength of "
+	             "the password, try:\n"
+	             " - using a longer password;\n"
+	             " - using a mixture of upper- and lower-case letters;\n"
+	             " - using numbers or symbols as well as letters.\n"
+	             "\n"
+	             "Would you like to use this password anyway?"),
+	        i18n("Low Password Strength"));
+}
+
+static const int POPUP_FLAGS = TQt::WStyle_Customize | TQt::WDestructiveClose | TQt::WX11BypassWM |
+        TQt::WStyle_StaysOnTop | TQt::WStyle_Tool | TQt::WStyle_NoBorder;
+
+KPassivePopup::KPassivePopup(TQWidget *parent, const char *name, WFlags f) :
+		TQFrame(0, name, (WFlags)(f ? (int)f : POPUP_FLAGS)), window(parent ? parent->winId() : 0L),
+		        msgView(0), topLayout(0), hideDelay(DEFAULT_POPUP_TIME),
+		        hideTimer(new TQTimer(this, "hide_timer")), m_autoDelete(false)
+{
+	init(DEFAULT_POPUP_TYPE);
+
+	move(right ? d->anchor.x() - width() + 20 : (d->anchor.x() < 11 ? 11 : d->anchor.x() - 20),
+	        bottom ? d->anchor.y() - height() : (d->anchor.y() < 11 ? 11 : d->anchor.y()));
+}
+
+TDEToggleAction* showMenubar(const TQObject *recvr, const char *slot, TDEActionCollection *parent,
+        const char *_name)
+{
+	TDEToggleAction *ret;
+	ret = new TDEToggleAction(i18n("Show &Menubar"), "showmenu",
+	        TDEStdAccel::shortcut(TDEStdAccel::ShowMenubar), recvr, slot, parent,
+	        _name ? _name : name(ShowMenubar));
+	ret->setWhatsThis(i18n("Show Menubar<p>"
+	                       "Shows the menubar again after it has been hidden"));
+	KGuiItem guiItem(i18n("Hide &Menubar"), 0 /*same icon*/, TQString::null,
+	        i18n("Hide Menubar<p>"
+	             "Hide the menubar. You can usually get it back using the right mouse button inside the window itself."));
+	return ret;
+}
+
+KProgressBoxDialog::KProgressBoxDialog(TQWidget *parent, const char *name, const TQString &caption,
+        const TQString &text, bool modal) :
+		KDialogBase(KDialogBase::Plain, caption, KDialogBase::Cancel,
+		        KDialogBase::Cancel, parent, name, modal), mAutoClose(true), mAutoReset(false),
+		        mCancelled(false), mAllowCancel(true), mAllowTextEdit(false), mShown(false),
+		        mMinDuration(2000), d(new KProgressBoxDialogPrivate)
+{
+	KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+}
+
+TDEPopupMenu* KPixmapRegionSelectorWidget::createPopupMenu()
+{
+	TDEPopupMenu *popup = new TDEPopupMenu(this, "PixmapRegionSelectorPopup");
+	popup->insertTitle(i18n("Image Operations"));
+
+	TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right", 0,
+	        TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()), TQT_TQOBJECT(popup), "rotateclockwise");
+	action->plug(popup);
+
+	action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left", 0,
+	        TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()), TQT_TQOBJECT(popup),
+	        "rotatecounterclockwise");
+	action->plug(popup);
+	return popup;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30344-issue_3105_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30344-issue_3105_2.cpp
new file mode 100644
index 00000000..c4eb7129
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30344-issue_3105_2.cpp
@@ -0,0 +1,94 @@
+struct KPluginSelectionWidget::KPluginSelectionWidgetPrivate
+{
+	KPluginSelectionWidgetPrivate(KPluginSelector *_kps, const TQString &_cat,
+	    TDEConfigGroup *_config) :
+			widgetstack(0), kps(_kps), config(_config), tooltip(0), catname(_cat), currentplugininfo(0),
+			visible(true), currentchecked(false), changed(0)
+	{
+		moduleParentComponents.setAutoDelete(true);
+	}
+};
+
+KPasswordDialog::KPasswordDialog(Types type, bool enableKeep, int extraBttn, TQWidget *parent,
+    const char *name) :
+		KDialogBase(parent, name, true, "", Ok | Cancel | extraBttn,
+		    Ok, true), m_Keep(enableKeep ? 1 : 0), m_Type(type), m_keepWarnLbl(0),
+		d(new KPasswordDialogPrivate)
+{
+	d->iconName = "password";
+	init();
+
+	const TQString strengthBarWhatsThis(i18n(
+				"The password strength meter gives an indication of the security "
+				"of the password you have entered.  To improve the strength of "
+				"the password, try:\n"
+				" - using a longer password;\n"
+				" - using a mixture of upper- and lower-case letters;\n"
+				" - using numbers or symbols, such as #, as well as letters."));
+
+	int retVal = KMessageBox::warningContinueCancel(this,
+	        i18n("The password you have entered has a low strength. "
+	             "To improve the strength of "
+	             "the password, try:\n"
+	             " - using a longer password;\n"
+	             " - using a mixture of upper- and lower-case letters;\n"
+	             " - using numbers or symbols as well as letters.\n"
+	             "\n"
+	             "Would you like to use this password anyway?"),
+	        i18n("Low Password Strength"));
+}
+
+static const int POPUP_FLAGS = TQt::WStyle_Customize | TQt::WDestructiveClose | TQt::WX11BypassWM |
+    TQt::WStyle_StaysOnTop | TQt::WStyle_Tool | TQt::WStyle_NoBorder;
+
+KPassivePopup::KPassivePopup(TQWidget *parent, const char *name, WFlags f) :
+		TQFrame(0, name, (WFlags)(f ? (int)f : POPUP_FLAGS)), window(parent ? parent->winId() : 0L),
+		msgView(0), topLayout(0), hideDelay(DEFAULT_POPUP_TIME),
+		hideTimer(new TQTimer(this, "hide_timer")), m_autoDelete(false)
+{
+	init(DEFAULT_POPUP_TYPE);
+
+	move(right ? d->anchor.x() - width() + 20 : (d->anchor.x() < 11 ? 11 : d->anchor.x() - 20),
+	    bottom ? d->anchor.y() - height() : (d->anchor.y() < 11 ? 11 : d->anchor.y()));
+}
+
+TDEToggleAction* showMenubar(const TQObject *recvr, const char *slot, TDEActionCollection *parent,
+    const char *_name)
+{
+	TDEToggleAction *ret;
+	ret = new TDEToggleAction(i18n("Show &Menubar"), "showmenu",
+	        TDEStdAccel::shortcut(TDEStdAccel::ShowMenubar), recvr, slot, parent,
+	        _name ? _name : name(ShowMenubar));
+	ret->setWhatsThis(i18n("Show Menubar<p>"
+	                       "Shows the menubar again after it has been hidden"));
+	KGuiItem guiItem(i18n("Hide &Menubar"), 0 /*same icon*/, TQString::null,
+	    i18n("Hide Menubar<p>"
+	         "Hide the menubar. You can usually get it back using the right mouse button inside the window itself."));
+	return ret;
+}
+
+KProgressBoxDialog::KProgressBoxDialog(TQWidget *parent, const char *name, const TQString &caption,
+    const TQString &text, bool modal) :
+		KDialogBase(KDialogBase::Plain, caption, KDialogBase::Cancel,
+		    KDialogBase::Cancel, parent, name, modal), mAutoClose(true), mAutoReset(false),
+		mCancelled(false), mAllowCancel(true), mAllowTextEdit(false), mShown(false), mMinDuration(2000),
+		d(new KProgressBoxDialogPrivate)
+{
+	KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+}
+
+TDEPopupMenu* KPixmapRegionSelectorWidget::createPopupMenu()
+{
+	TDEPopupMenu *popup = new TDEPopupMenu(this, "PixmapRegionSelectorPopup");
+	popup->insertTitle(i18n("Image Operations"));
+
+	TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right", 0,
+	        TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()), TQT_TQOBJECT(popup), "rotateclockwise");
+	action->plug(popup);
+
+	action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left", 0,
+	        TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()), TQT_TQOBJECT(popup),
+	        "rotatecounterclockwise");
+	action->plug(popup);
+	return popup;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30345-issue_3105_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30345-issue_3105_2.cpp
new file mode 100644
index 00000000..6c5e374a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30345-issue_3105_2.cpp
@@ -0,0 +1,98 @@
+struct KPluginSelectionWidget::KPluginSelectionWidgetPrivate
+{
+	KPluginSelectionWidgetPrivate(KPluginSelector *_kps, const TQString &_cat,
+	                              TDEConfigGroup *_config) :
+			widgetstack(0), kps(_kps), config(_config), tooltip(0), catname(_cat), currentplugininfo(0),
+			visible(true), currentchecked(false), changed(0)
+	{
+		moduleParentComponents.setAutoDelete(true);
+	}
+};
+
+KPasswordDialog::KPasswordDialog(Types type, bool enableKeep, int extraBttn, TQWidget *parent,
+                                 const char *name) :
+		KDialogBase(parent, name, true, "", Ok | Cancel | extraBttn,
+		            Ok, true), m_Keep(enableKeep ? 1 : 0), m_Type(type), m_keepWarnLbl(0),
+		d(new KPasswordDialogPrivate)
+{
+	d->iconName = "password";
+	init();
+
+	const TQString strengthBarWhatsThis(i18n(
+																				"The password strength meter gives an indication of the security "
+																				"of the password you have entered.  To improve the strength of "
+																				"the password, try:\n"
+																				" - using a longer password;\n"
+																				" - using a mixture of upper- and lower-case letters;\n"
+																				" - using numbers or symbols, such as #, as well as letters."));
+
+	int retVal = KMessageBox::warningContinueCancel(this,
+	                                                i18n(
+																										"The password you have entered has a low strength. "
+																										"To improve the strength of "
+																										"the password, try:\n"
+																										" - using a longer password;\n"
+																										" - using a mixture of upper- and lower-case letters;\n"
+																										" - using numbers or symbols as well as letters.\n"
+																										"\n"
+																										"Would you like to use this password anyway?"),
+	                                                i18n("Low Password Strength"));
+}
+
+static const int POPUP_FLAGS = TQt::WStyle_Customize | TQt::WDestructiveClose | TQt::WX11BypassWM |
+                               TQt::WStyle_StaysOnTop | TQt::WStyle_Tool | TQt::WStyle_NoBorder;
+
+KPassivePopup::KPassivePopup(TQWidget *parent, const char *name, WFlags f) :
+		TQFrame(0, name, (WFlags)(f ? (int)f : POPUP_FLAGS)), window(parent ? parent->winId() : 0L),
+		msgView(0), topLayout(0), hideDelay(DEFAULT_POPUP_TIME),
+		hideTimer(new TQTimer(this, "hide_timer")),
+		m_autoDelete(false)
+{
+	init(DEFAULT_POPUP_TYPE);
+
+	move(right ? d->anchor.x() - width() + 20 : (d->anchor.x() < 11 ? 11 : d->anchor.x() - 20),
+	     bottom ? d->anchor.y() - height() : (d->anchor.y() < 11 ? 11 : d->anchor.y()));
+}
+
+TDEToggleAction* showMenubar(const TQObject *recvr, const char *slot, TDEActionCollection *parent,
+                             const char *_name)
+{
+	TDEToggleAction *ret;
+	ret = new TDEToggleAction(i18n("Show &Menubar"), "showmenu",
+	                          TDEStdAccel::shortcut(TDEStdAccel::ShowMenubar), recvr, slot, parent,
+	                          _name ? _name : name(ShowMenubar));
+	ret->setWhatsThis(i18n("Show Menubar<p>"
+	                       "Shows the menubar again after it has been hidden"));
+	KGuiItem guiItem(i18n("Hide &Menubar"), 0 /*same icon*/, TQString::null,
+	                 i18n("Hide Menubar<p>"
+	                      "Hide the menubar. You can usually get it back using the right mouse button inside the window itself."));
+	return ret;
+}
+
+KProgressBoxDialog::KProgressBoxDialog(TQWidget *parent, const char *name, const TQString &caption,
+                                       const TQString &text, bool modal) :
+		KDialogBase(KDialogBase::Plain, caption, KDialogBase::Cancel,
+		            KDialogBase::Cancel, parent, name, modal), mAutoClose(true), mAutoReset(false),
+		mCancelled(false), mAllowCancel(true), mAllowTextEdit(false), mShown(false), mMinDuration(2000),
+		d(new KProgressBoxDialogPrivate)
+{
+	KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+}
+
+TDEPopupMenu* KPixmapRegionSelectorWidget::createPopupMenu()
+{
+	TDEPopupMenu *popup = new TDEPopupMenu(this, "PixmapRegionSelectorPopup");
+	popup->insertTitle(i18n("Image Operations"));
+
+	TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right", 0,
+	                                  TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()),
+	                                  TQT_TQOBJECT(popup), "rotateclockwise");
+	action->plug(popup);
+
+	action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left", 0,
+	                       TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()),
+	                       TQT_TQOBJECT(popup),
+	                       "rotatecounterclockwise");
+	action->plug(popup);
+	return popup;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30353-indent_ternary-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30353-indent_ternary-1.cpp
index c5fa89e5..c5fa89e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30353-indent_ternary-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30353-indent_ternary-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp
index 15cc6e3a..15cc6e3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30401-Issue_2570.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30401-Issue_2570.cpp
index 44373e77..44373e77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30401-Issue_2570.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30401-Issue_2570.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30701-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30701-function-def.cpp
index 89261c8e..89261c8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30701-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30701-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30702-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30702-function-def.cpp
index c1fb4ed4..c1fb4ed4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30702-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30702-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30703-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30703-function-def.cpp
index c604152d..c604152d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30703-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30703-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30705-func_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30705-func_param.cpp
index 8bdb0ce8..8bdb0ce8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30705-func_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30705-func_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30706-bug_1020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30706-bug_1020.cpp
index f0e9e60d..f0e9e60d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30706-bug_1020.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30706-bug_1020.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30711-semicolons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30711-semicolons.cpp
index de28deef..de28deef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30711-semicolons.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30711-semicolons.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30712-bug_1158.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30712-bug_1158.cpp
index 2a9ba76d..2a9ba76d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30712-bug_1158.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30712-bug_1158.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp
index 890f2eba..890f2eba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30714-Issue_1733.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30714-Issue_1733.cpp
index 10be5586..10be5586 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30714-Issue_1733.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30714-Issue_1733.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30715-Issue_2942.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30715-Issue_2942.cpp
index dbecc7f4..dbecc7f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30715-Issue_2942.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30715-Issue_2942.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30720-custom-open-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30720-custom-open-2.cpp
index 4d05944a..4d05944a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30720-custom-open-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30720-custom-open-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30721-Issue_2386.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30721-Issue_2386.cpp
index ac0b1dd4..ac0b1dd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30721-Issue_2386.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30721-Issue_2386.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30730-qt-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30730-qt-1.cpp
index 5d0273e2..5d0273e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30730-qt-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30730-qt-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30731-qt-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30731-qt-1.cpp
index 55b2459b..55b2459b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30731-qt-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30731-qt-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30732-Issue_2734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30732-Issue_2734.cpp
index 27dfdc70..27dfdc70 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30732-Issue_2734.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30732-Issue_2734.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30740-sef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30740-sef.cpp
index 8730ba15..8730ba15 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30740-sef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30740-sef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30741-al.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30741-al.cpp
index 1c911bf2..1c911bf2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30741-al.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30741-al.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30742-delete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30742-delete.cpp
index c33aa682..c33aa682 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30742-delete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30742-delete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30745-Issue_2170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30745-Issue_2170.cpp
index f1edafd8..f1edafd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30745-Issue_2170.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30745-Issue_2170.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30746-DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30746-DefaultAndDelete.cpp
index 7dff7dd5..7dff7dd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30746-DefaultAndDelete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30746-DefaultAndDelete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30747-DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30747-DefaultAndDelete.cpp
index 30d315a7..30d315a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30747-DefaultAndDelete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30747-DefaultAndDelete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30748-DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30748-DefaultAndDelete.cpp
index 9b55a964..9b55a964 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30748-DefaultAndDelete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30748-DefaultAndDelete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30750-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30750-lambda.cpp
index daa4bac4..daa4bac4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30750-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30750-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30751-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30751-lambda.cpp
index 291610c5..291610c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30751-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30751-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30752-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30752-lambda.cpp
index 5c0f72b0..5c0f72b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30752-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30752-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30753-lambda2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30753-lambda2.cpp
index d91798a6..d91798a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30753-lambda2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30753-lambda2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30754-bug_i_682.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30754-bug_i_682.h
index 51c58e23..51c58e23 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30754-bug_i_682.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30754-bug_i_682.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30755-bug_i_938.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30755-bug_i_938.h
index b13997a6..b13997a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30755-bug_i_938.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30755-bug_i_938.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30756-bug_1296.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30756-bug_1296.cpp
index 7f7757c4..7f7757c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30756-bug_1296.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30756-bug_1296.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30757-Issue_3054.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30757-Issue_3054.cpp
index 53edc388..53edc388 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30757-Issue_3054.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30757-Issue_3054.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30758-Issue_3054-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30758-Issue_3054-2.cpp
index e4c1c8da..e4c1c8da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30758-Issue_3054-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30758-Issue_3054-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30759-lambda2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30759-lambda2.cpp
index 09c779b5..09c779b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30759-lambda2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30759-lambda2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30760-bug_1296.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30760-bug_1296.cpp
index a5535041..a5535041 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30760-bug_1296.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30760-bug_1296.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30761-out-668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30761-out-668.cpp
index 8829c0ce..8829c0ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30761-out-668.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30761-out-668.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30762-out-668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30762-out-668.cpp
index 0dac74c3..0dac74c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30762-out-668.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30762-out-668.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30763-Issue_2166.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30763-Issue_2166.cpp
index d9ac55c7..d9ac55c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30763-Issue_2166.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30763-Issue_2166.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30764-Issue_2591.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30764-Issue_2591.cpp
index 01ed232e..01ed232e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30764-Issue_2591.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30764-Issue_2591.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30765-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30765-lambda.cpp
index 05e372e3..05e372e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30765-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30765-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30766-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30766-lambda.cpp
index 05e372e3..05e372e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30766-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30766-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30767-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30767-lambda.cpp
index 05e372e3..05e372e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30767-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30767-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30768-sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30768-sp_cpp_lambda_fparen.cpp
index e25d0496..e25d0496 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30768-sp_cpp_lambda_fparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30768-sp_cpp_lambda_fparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30770-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30770-lambda.cpp
index 5bce0d31..5bce0d31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30770-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30770-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30771-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30771-lambda.cpp
index acc5b530..acc5b530 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30771-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30771-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30772-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30772-lambda.cpp
index 304e4d10..304e4d10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30772-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30772-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30773-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30773-lambda.cpp
index f494244a..f494244a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30773-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30773-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30774-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30774-lambda.cpp
index f494244a..f494244a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30774-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30774-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30775-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30775-lambda.cpp
index 80e9c8f9..80e9c8f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30775-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30775-lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp
index e0c1985d..e0c1985d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp
index f882a211..f882a211 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp
index c740c4bd..c740c4bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30781-lambda_brace_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30781-lambda_brace_list.cpp
index 8626f5af..8626f5af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30781-lambda_brace_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30781-lambda_brace_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30790-Issue_2795.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30790-Issue_2795.cpp
index 6cb7e112..6cb7e112 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30790-Issue_2795.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30790-Issue_2795.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30791-Issue_3203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30791-Issue_3203.cpp
index 519d29dd..519d29dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30791-Issue_3203.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30791-Issue_3203.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30800-align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30800-align-star-amp-pos.cpp
index dc988ce1..dc988ce1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30800-align-star-amp-pos.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30800-align-star-amp-pos.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30801-align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30801-align-star-amp-pos.cpp
index c23b0d4a..c23b0d4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30801-align-star-amp-pos.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30801-align-star-amp-pos.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30802-align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30802-align-star-amp-pos.cpp
index cf2bff2d..cf2bff2d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30802-align-star-amp-pos.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30802-align-star-amp-pos.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30803-bug_1403.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30803-bug_1403.cpp
index 209c0173..209c0173 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30803-bug_1403.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30803-bug_1403.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30805-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30805-ptr-star.cpp
index fcefa84f..fcefa84f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30805-ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30805-ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30806-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30806-ptr-star.cpp
index 76659df9..76659df9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30806-ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30806-ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30807-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30807-ptr-star.cpp
index 55478e3f..55478e3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30807-ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30807-ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30808-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30808-ptr-star.cpp
index 68cb8151..68cb8151 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30808-ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30808-ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30809-bug_1289.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30809-bug_1289.cpp
index 42663477..42663477 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30809-bug_1289.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30809-bug_1289.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30810-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30810-ptr-star.cpp
index fa88b0bc..fa88b0bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30810-ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30810-ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30811-misc3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30811-misc3.cpp
index 9ca06c3c..9ca06c3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30811-misc3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30811-misc3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30812-misc4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30812-misc4.cpp
index 5ddaffb0..5ddaffb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30812-misc4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30812-misc4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30813-misc5.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30813-misc5.cpp
index e8ffaf27..e8ffaf27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30813-misc5.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30813-misc5.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30814-misc6.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30814-misc6.cpp
index 95cc0383..95cc0383 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30814-misc6.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30814-misc6.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30815-cmt-reflow.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30815-cmt-reflow.cpp
index 8bd50283..8bd50283 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30815-cmt-reflow.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30815-cmt-reflow.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30816-for_long.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30816-for_long.cpp
index 5483d4c8..5483d4c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30816-for_long.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30816-for_long.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp
index 9acbac58..9acbac58 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30818-bug_1169.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30818-bug_1169.cpp
index b1138a57..b1138a57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30818-bug_1169.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30818-bug_1169.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30819-bug_1170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30819-bug_1170.cpp
index 18e029cb..18e029cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30819-bug_1170.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30819-bug_1170.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30820-pp-define-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30820-pp-define-indent.cpp
index 0d7892a2..0d7892a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30820-pp-define-indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30820-pp-define-indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30821-pp_indent_case.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30821-pp_indent_case.cpp
index 70b1b9c7..70b1b9c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30821-pp_indent_case.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30821-pp_indent_case.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30822-pp_indent_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30822-pp_indent_brace.cpp
index d1decdf6..d1decdf6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30822-pp_indent_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30822-pp_indent_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30823-pp_indent_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30823-pp_indent_func_def.cpp
index b01c6bbe..b01c6bbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30823-pp_indent_func_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30823-pp_indent_func_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30824-pp_indent_extern.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30824-pp_indent_extern.cpp
index 995db611..995db611 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30824-pp_indent_extern.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30824-pp_indent_extern.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30825-Issue_1966.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30825-Issue_1966.cpp
index 12a8084b..12a8084b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30825-Issue_1966.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30825-Issue_1966.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30826-Issue_2319.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30826-Issue_2319.cpp
index 8c0ae3e9..8c0ae3e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30826-Issue_2319.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30826-Issue_2319.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30827-Issue_1167.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30827-Issue_1167.cpp
index 6410326c..6410326c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30827-Issue_1167.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30827-Issue_1167.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30828-bug_1691.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30828-bug_1691.cpp
index e93f7f74..e93f7f74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30828-bug_1691.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30828-bug_1691.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30829-Issue_2726.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30829-Issue_2726.cpp
index bb7f1d4b..bb7f1d4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30829-Issue_2726.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30829-Issue_2726.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30830-kw_subst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30830-kw_subst.cpp
index 47084a7e..47084a7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30830-kw_subst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30830-kw_subst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30831-kw_subst2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30831-kw_subst2.cpp
index b5e58eac..b5e58eac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30831-kw_subst2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30831-kw_subst2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30832-kw_subst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30832-kw_subst.cpp
index 47084a7e..47084a7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30832-kw_subst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30832-kw_subst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30840-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30840-nl_func_type_name.cpp
index a4302001..a4302001 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30840-nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30840-nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30841-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30841-nl_func_type_name.cpp
index 5997a5c3..5997a5c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30841-nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30841-nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30842-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30842-nl_func_type_name.cpp
index a826af48..a826af48 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30842-nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30842-nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30843-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30843-nl_func_type_name.cpp
index b1ead857..b1ead857 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30843-nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30843-nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30844-Issue_2771.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30844-Issue_2771.cpp
index ab7c285f..ab7c285f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30844-Issue_2771.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30844-Issue_2771.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30845-deref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30845-deref.cpp
index 9705b51f..9705b51f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30845-deref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30845-deref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30846-Issue_3197.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30846-Issue_3197.h
index 76331aa3..76331aa3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30846-Issue_3197.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30846-Issue_3197.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc
index 9cc04a18..9cc04a18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30852-Issue_2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30852-Issue_2138.cpp
index 3a8fa83c..3a8fa83c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30852-Issue_2138.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30852-Issue_2138.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30853-noexcept.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30853-noexcept.cpp
index 60f2edd4..60f2edd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30853-noexcept.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30853-noexcept.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30854-Issue_1703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30854-Issue_1703.cpp
index af32d661..af32d661 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30854-Issue_1703.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30854-Issue_1703.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30855-cpp_move.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30855-cpp_move.cpp
index cec9beb8..cec9beb8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30855-cpp_move.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30855-cpp_move.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30856-sp_cmt_cpp_region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30856-sp_cmt_cpp_region.cpp
index dc9e4160..dc9e4160 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30856-sp_cmt_cpp_region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30856-sp_cmt_cpp_region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30857-sp_cmt_cpp_region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30857-sp_cmt_cpp_region.cpp
index 29f75936..29f75936 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30857-sp_cmt_cpp_region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30857-sp_cmt_cpp_region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30860-sf574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30860-sf574.cpp
index 58810404..58810404 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30860-sf574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30860-sf574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30870-cmt_insert.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30870-cmt_insert.cpp
index cf5ac204..cf5ac204 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30870-cmt_insert.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30870-cmt_insert.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30871-cmt_insert.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30871-cmt_insert.cpp
index a169795a..a169795a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30871-cmt_insert.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30871-cmt_insert.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30872-Issue_2752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30872-Issue_2752.cpp
index b305b50f..b305b50f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30872-Issue_2752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30872-Issue_2752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30880-bug_1758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30880-bug_1758.cpp
index b0f35107..b0f35107 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30880-bug_1758.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30880-bug_1758.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30881-bug_1758-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30881-bug_1758-f.cpp
index 24bb563b..24bb563b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30881-bug_1758-f.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30881-bug_1758-f.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30900-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30900-region.cpp
index 27823ca6..27823ca6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30900-region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30900-region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30901-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30901-region.cpp
index b7bebae8..b7bebae8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30901-region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30901-region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30902-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30902-region.cpp
index 39b20ea6..39b20ea6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30902-region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30902-region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30903-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30903-region.cpp
index d6e3403a..d6e3403a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30903-region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30903-region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30907-Issue_1813.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30907-Issue_1813.cpp
index d5a3cc71..d5a3cc71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30907-Issue_1813.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30907-Issue_1813.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30908-Issue_1813-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30908-Issue_1813-2.cpp
index 310de82f..310de82f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30908-Issue_1813-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30908-Issue_1813-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30909-Issue_1813-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30909-Issue_1813-3.cpp
index 08c8405d..08c8405d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30909-Issue_1813-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30909-Issue_1813-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30910-indent_namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30910-indent_namespace.h
index d569a3ca..d569a3ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30910-indent_namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30910-indent_namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30911-indent_namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30911-indent_namespace.h
index 6f80dc3b..6f80dc3b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30911-indent_namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30911-indent_namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30912-long_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30912-long_namespace.cpp
index 80af6e83..80af6e83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30912-long_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30912-long_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30913-indent_namespace2.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30913-indent_namespace2.h
index 196b2322..196b2322 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30913-indent_namespace2.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30913-indent_namespace2.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30914-indent_namespace_single_indent.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30914-indent_namespace_single_indent.h
index 24a9b935..24a9b935 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30914-indent_namespace_single_indent.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30914-indent_namespace_single_indent.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30915-bug_1235.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30915-bug_1235.cpp
index b9ff78a1..b9ff78a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30915-bug_1235.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30915-bug_1235.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30916-Issue_1737.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30916-Issue_1737.cpp
index 06b0866b..06b0866b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30916-Issue_1737.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30916-Issue_1737.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30917-Issue_2345-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30917-Issue_2345-3.cpp
index 787ce29b..787ce29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30917-Issue_2345-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30917-Issue_2345-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30918-Issue_2345-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30918-Issue_2345-4.cpp
index f82d757d..f82d757d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30918-Issue_2345-4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30918-Issue_2345-4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30919-Issue_2387.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30919-Issue_2387.cpp
index 526278d6..526278d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30919-Issue_2387.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30919-Issue_2387.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30920-indent-off.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30920-indent-off.cpp
index f9eccdb8..f9eccdb8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30920-indent-off.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30920-indent-off.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30921-variadic-template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30921-variadic-template.h
index f159e700..f159e700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30921-variadic-template.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30921-variadic-template.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30922-variadic-template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30922-variadic-template.h
index 0a1bd443..0a1bd443 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30922-variadic-template.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30922-variadic-template.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30923-sf.2886991.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30923-sf.2886991.cpp
index 61dc7c21..61dc7c21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30923-sf.2886991.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30923-sf.2886991.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30924-sf.2886991.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30924-sf.2886991.cpp
index ce5e0b93..ce5e0b93 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30924-sf.2886991.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30924-sf.2886991.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30925-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30925-function-def.cpp
index 2d6df544..2d6df544 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30925-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30925-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30926-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30926-function-def.cpp
index 78b23a14..78b23a14 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30926-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30926-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30927-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30927-function-def.cpp
index bceb00f6..bceb00f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30927-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30927-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30928-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30928-function-def.cpp
index b14ecb11..b14ecb11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30928-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30928-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30929-bug_1324.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30929-bug_1324.cpp
index 1aca5762..1aca5762 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30929-bug_1324.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30929-bug_1324.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30930-indent_var_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30930-indent_var_def.cpp
index 5b3ee4e2..5b3ee4e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30930-indent_var_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30930-indent_var_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30931-indent_var_def_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30931-indent_var_def_cont.cpp
index c505389f..c505389f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30931-indent_var_def_cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30931-indent_var_def_cont.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30932-indent_var_def_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30932-indent_var_def_cont.cpp
index 70b7304e..70b7304e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30932-indent_var_def_cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30932-indent_var_def_cont.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30933-indent_paren_after_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30933-indent_paren_after_func_def.cpp
index 8a775135..8a775135 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30933-indent_paren_after_func_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30933-indent_paren_after_func_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30934-indent_paren_after_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30934-indent_paren_after_func_decl.cpp
index 6af21978..6af21978 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30934-indent_paren_after_func_decl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30934-indent_paren_after_func_decl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30935-indent-misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30935-indent-misc.cpp
index ad8de7b0..ad8de7b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30935-indent-misc.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30935-indent-misc.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30936-indent_braces_no.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30936-indent_braces_no.h
index 725b0402..725b0402 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30936-indent_braces_no.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30936-indent_braces_no.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30937-indent_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30937-indent_param.cpp
index 31569ec1..31569ec1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30937-indent_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30937-indent_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30938-indent_switch_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30938-indent_switch_pp.cpp
index dd910c56..dd910c56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30938-indent_switch_pp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30938-indent_switch_pp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30939-indent_paren_after_func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30939-indent_paren_after_func_call.cpp
index a1453862..a1453862 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30939-indent_paren_after_func_call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30939-indent_paren_after_func_call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30940-case-brace-remove.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30940-case-brace-remove.cpp
index cd163570..cd163570 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30940-case-brace-remove.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30940-case-brace-remove.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30941-Issue_2150.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30941-Issue_2150.cpp
index 1e4d6bf5..1e4d6bf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30941-Issue_2150.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30941-Issue_2150.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30942-Issue_1692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30942-Issue_1692.cpp
index 89de1d6a..89de1d6a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30942-Issue_1692.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30942-Issue_1692.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30943-Issue_2735.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30943-Issue_2735.cpp
index 3e292425..3e292425 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30943-Issue_2735.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30943-Issue_2735.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30945-sf.3266678.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30945-sf.3266678.cpp
index 810b5105..810b5105 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30945-sf.3266678.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30945-sf.3266678.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30946-sf.3315874.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30946-sf.3315874.h
index 05161496..05161496 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30946-sf.3315874.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30946-sf.3315874.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30947-bug_1689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30947-bug_1689.cpp
index 40d34d61..40d34d61 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30947-bug_1689.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30947-bug_1689.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30948-sp_before_byref_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30948-sp_before_byref_func.cpp
index 4abfe954..4abfe954 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30948-sp_before_byref_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30948-sp_before_byref_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30949-Issue_2757.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30949-Issue_2757.cpp
index ba83c29e..ba83c29e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30949-Issue_2757.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30949-Issue_2757.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30950-sp_before_tr_emb_cmt_input.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30950-sp_before_tr_emb_cmt_input.cpp
index 943d303b..943d303b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30950-sp_before_tr_emb_cmt_input.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30950-sp_before_tr_emb_cmt_input.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30951-sp_before_tr_emb_cmt_input.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30951-sp_before_tr_emb_cmt_input.cpp
index c7e25f1c..c7e25f1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30951-sp_before_tr_emb_cmt_input.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30951-sp_before_tr_emb_cmt_input.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp
index ad0e38d5..ad0e38d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30953-constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30953-constr_colon.cpp
index 6c0706e5..6c0706e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30953-constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30953-constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30954-Issue_2305.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30954-Issue_2305.cpp
index 7458b913..7458b913 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30954-Issue_2305.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30954-Issue_2305.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30955-indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30955-indent_ctor_init.cpp
index 55982328..55982328 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30955-indent_ctor_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30955-indent_ctor_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30956-indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30956-indent_ctor_init.cpp
index 29a146a9..29a146a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30956-indent_ctor_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30956-indent_ctor_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30957-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30957-class-init.cpp
index faa28873..faa28873 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30957-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30957-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30958-nl_for_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30958-nl_for_leave_one_liners.cpp
index 8ff2405f..8ff2405f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30958-nl_for_leave_one_liners.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30958-nl_for_leave_one_liners.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30959-nl_for_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30959-nl_for_leave_one_liners.cpp
index 382d2815..382d2815 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30959-nl_for_leave_one_liners.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30959-nl_for_leave_one_liners.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30960-Issue_2151.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30960-Issue_2151.cpp
index d0ee05d2..d0ee05d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30960-Issue_2151.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30960-Issue_2151.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30961-Issue_2232.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30961-Issue_2232.cpp
index 7867820b..7867820b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30961-Issue_2232.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30961-Issue_2232.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30962-nl_assign_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30962-nl_assign_leave_one_liners.cpp
index cf3325f0..cf3325f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30962-nl_assign_leave_one_liners.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30962-nl_assign_leave_one_liners.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30963-Issue_2907.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30963-Issue_2907.cpp
index c0192c4d..c0192c4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30963-Issue_2907.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30963-Issue_2907.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30964-Issue_2823.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30964-Issue_2823.cpp
index c633398f..c633398f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30964-Issue_2823.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30964-Issue_2823.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30965-return_remove.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30965-return_remove.cpp
new file mode 100644
index 00000000..85d7a545
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30965-return_remove.cpp
@@ -0,0 +1,8 @@
+void
+function(skip_it)
+{
+	if (skip_it)
+		return;
+
+	do_it();
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30966-return_remove.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30966-return_remove.cpp
new file mode 100644
index 00000000..2926b56a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30966-return_remove.cpp
@@ -0,0 +1,9 @@
+void
+function(skip_it)
+{
+	if (skip_it)
+		return;
+
+	do_it();
+	return;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30970-Issue_2219.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30970-Issue_2219.cpp
index e08cb889..e08cb889 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30970-Issue_2219.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30970-Issue_2219.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30971-Issue_2224.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30971-Issue_2224.cpp
index 0c454905..0c454905 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30971-Issue_2224.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30971-Issue_2224.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30972-Issue_2229.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30972-Issue_2229.cpp
index 0c44ed6a..0c44ed6a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30972-Issue_2229.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30972-Issue_2229.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30973-Issue_2236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30973-Issue_2236.cpp
index 7f7f01f5..7f7f01f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30973-Issue_2236.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30973-Issue_2236.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30974-using-alias-in-define.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30974-using-alias-in-define.cpp
index 1b4153d8..1b4153d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/30974-using-alias-in-define.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/30974-using-alias-in-define.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31000-digraph.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31000-digraph.cpp
index e985dae6..e985dae6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31000-digraph.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31000-digraph.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31001-digraph.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31001-digraph.cpp
index 641390a6..641390a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31001-digraph.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31001-digraph.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31050-pos_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31050-pos_assign.cpp
index af55296b..af55296b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31050-pos_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31050-pos_assign.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31051-pos_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31051-pos_assign.cpp
index af55296b..af55296b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31051-pos_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31051-pos_assign.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31101-nl_before_brace_open_test.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31101-nl_before_brace_open_test.cpp
index fdf9067a..fdf9067a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31101-nl_before_brace_open_test.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31101-nl_before_brace_open_test.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31102-nl_before_brace_open_test.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31102-nl_before_brace_open_test.cpp
index 59342e57..59342e57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31102-nl_before_brace_open_test.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31102-nl_before_brace_open_test.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31103-nl_before_brace_open_test.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31103-nl_before_brace_open_test.cpp
index 5efbf20e..5efbf20e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31103-nl_before_brace_open_test.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31103-nl_before_brace_open_test.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31104-nl_before_brace_open_test.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31104-nl_before_brace_open_test.cpp
index a1b93406..a1b93406 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31104-nl_before_brace_open_test.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31104-nl_before_brace_open_test.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31400-trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31400-trailing_return.cpp
index ef642eec..ef642eec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31400-trailing_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31400-trailing_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31401-trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31401-trailing_return.cpp
index bfc09585..bfc09585 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31401-trailing_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31401-trailing_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31402-trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31402-trailing_return.cpp
index 01adfc69..01adfc69 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31402-trailing_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31402-trailing_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31403-trailing_return_byref_ptr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31403-trailing_return_byref_ptr.cpp
index 9b7da565..9b7da565 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31403-trailing_return_byref_ptr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31403-trailing_return_byref_ptr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31404-trailing_return_byref_ptr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31404-trailing_return_byref_ptr.cpp
index 7ecf920d..7ecf920d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31404-trailing_return_byref_ptr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31404-trailing_return_byref_ptr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31450-indent_func_alias_prototype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31450-indent_func_alias_prototype.cpp
index 472f66b3..472f66b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31450-indent_func_alias_prototype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31450-indent_func_alias_prototype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31451-indent_func_alias_prototype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31451-indent_func_alias_prototype.cpp
index 2288f111..2288f111 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31451-indent_func_alias_prototype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31451-indent_func_alias_prototype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31452-indent_func_alias_prototype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31452-indent_func_alias_prototype.cpp
index 018b3dd6..018b3dd6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31452-indent_func_alias_prototype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31452-indent_func_alias_prototype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31562-sf562.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31562-sf562.cpp
index 15ee8e79..15ee8e79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31562-sf562.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31562-sf562.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31567-sf567.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31567-sf567.cpp
index 6d96731d..6d96731d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31567-sf567.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31567-sf567.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31568-Issue_2368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31568-Issue_2368.cpp
index 82b8c59c..82b8c59c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31568-Issue_2368.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31568-Issue_2368.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31583-sf583.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31583-sf583.cpp
index 34fc0c21..34fc0c21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31583-sf583.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31583-sf583.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31593-sf593.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31593-sf593.cpp
index 2d4499e6..2d4499e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31593-sf593.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31593-sf593.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31594-issue_672.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31594-issue_672.cpp
index 499f3168..499f3168 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31594-issue_672.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31594-issue_672.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31595-issue_1778.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31595-issue_1778.cpp
index 4eea46e0..4eea46e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31595-issue_1778.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31595-issue_1778.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31596-issue_1782.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31596-issue_1782.cpp
index 664ead7f..664ead7f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31596-issue_1782.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31596-issue_1782.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31597-issue_1804.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31597-issue_1804.cpp
index c98ecdef..c98ecdef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31597-issue_1804.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31597-issue_1804.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31598-Issue_1753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31598-Issue_1753.cpp
index 9f7da399..9f7da399 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31598-Issue_1753.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31598-Issue_1753.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31599-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31599-parameter-packs.cpp
index 4961aa2b..4961aa2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31599-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31599-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31600-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31600-parameter-packs.cpp
index 5d1cd8e8..5d1cd8e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31600-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31600-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31601-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31601-parameter-packs.cpp
index 0394fe8b..0394fe8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31601-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31601-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31602-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31602-parameter-packs.cpp
index 15d0a382..15d0a382 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31602-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31602-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31603-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31603-parameter-packs.cpp
index 3a810b8a..3a810b8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31603-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31603-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31604-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31604-parameter-packs.cpp
index 2a180b34..2a180b34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31604-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31604-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31605-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31605-parameter-packs.cpp
index a08af3cf..a08af3cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31605-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31605-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31606-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31606-parameter-packs.cpp
index a73e2c43..a73e2c43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31606-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31606-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31607-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31607-parameter-packs.cpp
index 153fc615..153fc615 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31607-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31607-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31608-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31608-parameter-packs.cpp
index 13ba49db..13ba49db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31608-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31608-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31609-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31609-parameter-packs.cpp
index e00841b4..e00841b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31609-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31609-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31610-Issue_2085.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31610-Issue_2085.cpp
index 581f4db4..581f4db4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31610-Issue_2085.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31610-Issue_2085.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31611-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31611-parameter-packs.cpp
index 4e89022d..4e89022d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31611-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31611-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31612-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31612-parameter-packs.cpp
index 4e89022d..4e89022d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31612-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31612-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31613-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31613-parameter-packs.cpp
index 4e89022d..4e89022d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31613-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31613-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31614-Issue_3309.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31614-Issue_3309.cpp
index d6dd1dac..d6dd1dac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31614-Issue_3309.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31614-Issue_3309.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31615-Issue_3309.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31615-Issue_3309.cpp
index 84ee58aa..84ee58aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31615-Issue_3309.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31615-Issue_3309.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31616-Issue_3309.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31616-Issue_3309.cpp
index c269ddb0..c269ddb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31616-Issue_3309.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31616-Issue_3309.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31620-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31620-sp_after_type.cpp
index 460c0dc2..460c0dc2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31620-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31620-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31621-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31621-sp_after_type.cpp
index b1ffd02b..b1ffd02b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31621-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31621-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31622-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31622-sp_after_type.cpp
index a924423a..a924423a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31622-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31622-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31623-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31623-sp_after_type.cpp
index 5d923c27..5d923c27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31623-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31623-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31624-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31624-sp_after_type.cpp
index b66aba0c..b66aba0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31624-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31624-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31625-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31625-sp_after_type.cpp
index add7b57e..add7b57e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31625-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31625-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31626-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31626-issue_1916.cpp
index 56ce6f4c..56ce6f4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31626-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31626-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31627-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31627-issue_1916.cpp
index f84334a4..f84334a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31627-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31627-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31628-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31628-issue_1916.cpp
index df2af994..df2af994 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31628-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31628-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31629-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31629-issue_1916.cpp
index 913f1e28..913f1e28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31629-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31629-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31630-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31630-issue_1916.cpp
index df2af994..df2af994 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31630-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31630-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31631-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31631-issue_1916.cpp
index 913f1e28..913f1e28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31631-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31631-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31632-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31632-issue_1916.cpp
index 292b6837..292b6837 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31632-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31632-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31633-sp_after_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31633-sp_after_decltype.cpp
index 6a62e6f2..6a62e6f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31633-sp_after_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31633-sp_after_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31634-sp_after_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31634-sp_after_decltype.cpp
index c48543be..c48543be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31634-sp_after_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31634-sp_after_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31635-sp_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31635-sp_decltype.cpp
index 84b157f1..84b157f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31635-sp_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31635-sp_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31636-Issue_1923.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31636-Issue_1923.cpp
index 8c3ebe66..8c3ebe66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31636-Issue_1923.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31636-Issue_1923.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31637-Issue_3446.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31637-Issue_3446.cpp
index 9577cfa8..9577cfa8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31637-Issue_3446.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31637-Issue_3446.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31638-misc2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31638-misc2.cpp
new file mode 100644
index 00000000..918c61ec
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31638-misc2.cpp
@@ -0,0 +1,58 @@
+/*
+   I tried to modify the spaces when using casts like static_cast etc. by
+   using sp_before_angle, sp_after_angle and sp_inside_angle. Even setting
+   all of those options to remove results in the following:
+ */
+
+myvar = dynamic_cast<MyClass<T>*>(other);
+// expected:
+//myvar = dynamic_cast<MyClass<T>*>(other);
+
+/*
+   Sometime pointers and references are still not detected correctly in
+   special cases - i guess.
+ */
+//When using "sp_before_ptr_star = remove" the result is:
+typedef std::list<StreamedData*>::iterator iterator;
+//typedef std::list<StreamedData *>::iterator iterator;
+//------------------------------^ This space show not be there
+
+typedef void (T::*Routine)(void);
+
+//Similar with "sp_before_byref = remove":
+unsigned long allocate(unsigned long size, void* & p);
+
+//unsigned long allocate(unsigned long size, void* & p);
+//------------------------------------------------^ The same here
+
+void foo(void)
+{
+  List<byte> bob = new List<byte>();
+
+  /* Align assignments */
+  align_assign(Chunk::GetHead(),
+               cpd.settings [UO_align_assign_span].n,
+               cpd.settings [UO_align_assign_thresh].n);
+}
+
+Args::Args(int argc, char**argv)
+{
+  m_count = argc;
+  m_values = argv;
+  int len = (argc >> 3) + 1;
+  m_used = new UINT8 [len];
+  if (m_used != NULL) {
+    memset(m_used, 0, len);
+  }
+}
+
+void Args(int argc, char**argv)
+{
+  m_count = argc;
+  m_values = argv;
+  int len = (argc >> 3) + 1;
+  m_used = new UINT8 [len];
+  if (m_used != NULL) {
+    memset(m_used, 0, len);
+  }
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31639-misc2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31639-misc2.cpp
new file mode 100644
index 00000000..62a51621
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31639-misc2.cpp
@@ -0,0 +1,58 @@
+/*
+   I tried to modify the spaces when using casts like static_cast etc. by
+   using sp_before_angle, sp_after_angle and sp_inside_angle. Even setting
+   all of those options to remove results in the following:
+ */
+
+myvar = dynamic_cast<MyClass<T>*>(other);
+// expected:
+//myvar = dynamic_cast<MyClass<T>*>(other);
+
+/*
+   Sometime pointers and references are still not detected correctly in
+   special cases - i guess.
+ */
+//When using "sp_before_ptr_star = remove" the result is:
+typedef std::list<StreamedData*>::iterator iterator;
+//typedef std::list<StreamedData *>::iterator iterator;
+//------------------------------^ This space show not be there
+
+typedef void (T::*Routine)(void);
+
+//Similar with "sp_before_byref = remove":
+unsigned long allocate(unsigned long size, void*& p);
+
+//unsigned long allocate(unsigned long size, void* & p);
+//------------------------------------------------^ The same here
+
+void foo(void)
+{
+  List<byte> bob = new List<byte>();
+
+  /* Align assignments */
+  align_assign(Chunk::GetHead(),
+               cpd.settings [UO_align_assign_span].n,
+               cpd.settings [UO_align_assign_thresh].n);
+}
+
+Args::Args(int argc, char**argv)
+{
+  m_count = argc;
+  m_values = argv;
+  int len = (argc >> 3) + 1;
+  m_used = new UINT8 [len];
+  if (m_used != NULL) {
+    memset(m_used, 0, len);
+  }
+}
+
+void Args(int argc, char**argv)
+{
+  m_count = argc;
+  m_values = argv;
+  int len = (argc >> 3) + 1;
+  m_used = new UINT8 [len];
+  if (m_used != NULL) {
+    memset(m_used, 0, len);
+  }
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31640-misc2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31640-misc2.cpp
new file mode 100644
index 00000000..918c61ec
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31640-misc2.cpp
@@ -0,0 +1,58 @@
+/*
+   I tried to modify the spaces when using casts like static_cast etc. by
+   using sp_before_angle, sp_after_angle and sp_inside_angle. Even setting
+   all of those options to remove results in the following:
+ */
+
+myvar = dynamic_cast<MyClass<T>*>(other);
+// expected:
+//myvar = dynamic_cast<MyClass<T>*>(other);
+
+/*
+   Sometime pointers and references are still not detected correctly in
+   special cases - i guess.
+ */
+//When using "sp_before_ptr_star = remove" the result is:
+typedef std::list<StreamedData*>::iterator iterator;
+//typedef std::list<StreamedData *>::iterator iterator;
+//------------------------------^ This space show not be there
+
+typedef void (T::*Routine)(void);
+
+//Similar with "sp_before_byref = remove":
+unsigned long allocate(unsigned long size, void* & p);
+
+//unsigned long allocate(unsigned long size, void* & p);
+//------------------------------------------------^ The same here
+
+void foo(void)
+{
+  List<byte> bob = new List<byte>();
+
+  /* Align assignments */
+  align_assign(Chunk::GetHead(),
+               cpd.settings [UO_align_assign_span].n,
+               cpd.settings [UO_align_assign_thresh].n);
+}
+
+Args::Args(int argc, char**argv)
+{
+  m_count = argc;
+  m_values = argv;
+  int len = (argc >> 3) + 1;
+  m_used = new UINT8 [len];
+  if (m_used != NULL) {
+    memset(m_used, 0, len);
+  }
+}
+
+void Args(int argc, char**argv)
+{
+  m_count = argc;
+  m_values = argv;
+  int len = (argc >> 3) + 1;
+  m_used = new UINT8 [len];
+  if (m_used != NULL) {
+    memset(m_used, 0, len);
+  }
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31641-misc2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31641-misc2.cpp
new file mode 100644
index 00000000..918c61ec
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31641-misc2.cpp
@@ -0,0 +1,58 @@
+/*
+   I tried to modify the spaces when using casts like static_cast etc. by
+   using sp_before_angle, sp_after_angle and sp_inside_angle. Even setting
+   all of those options to remove results in the following:
+ */
+
+myvar = dynamic_cast<MyClass<T>*>(other);
+// expected:
+//myvar = dynamic_cast<MyClass<T>*>(other);
+
+/*
+   Sometime pointers and references are still not detected correctly in
+   special cases - i guess.
+ */
+//When using "sp_before_ptr_star = remove" the result is:
+typedef std::list<StreamedData*>::iterator iterator;
+//typedef std::list<StreamedData *>::iterator iterator;
+//------------------------------^ This space show not be there
+
+typedef void (T::*Routine)(void);
+
+//Similar with "sp_before_byref = remove":
+unsigned long allocate(unsigned long size, void* & p);
+
+//unsigned long allocate(unsigned long size, void* & p);
+//------------------------------------------------^ The same here
+
+void foo(void)
+{
+  List<byte> bob = new List<byte>();
+
+  /* Align assignments */
+  align_assign(Chunk::GetHead(),
+               cpd.settings [UO_align_assign_span].n,
+               cpd.settings [UO_align_assign_thresh].n);
+}
+
+Args::Args(int argc, char**argv)
+{
+  m_count = argc;
+  m_values = argv;
+  int len = (argc >> 3) + 1;
+  m_used = new UINT8 [len];
+  if (m_used != NULL) {
+    memset(m_used, 0, len);
+  }
+}
+
+void Args(int argc, char**argv)
+{
+  m_count = argc;
+  m_values = argv;
+  int len = (argc >> 3) + 1;
+  m_used = new UINT8 [len];
+  if (m_used != NULL) {
+    memset(m_used, 0, len);
+  }
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31660-issue_1919.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31660-issue_1919.cpp
index 187065d6..187065d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31660-issue_1919.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31660-issue_1919.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31661-Issue_3097.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31661-Issue_3097.cpp
index ede644ad..ede644ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31661-Issue_3097.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31661-Issue_3097.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31662-var_def_blks.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31662-var_def_blks.cpp
index 016aacec..016aacec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31662-var_def_blks.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31662-var_def_blks.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31663-var_def_blks.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31663-var_def_blks.cpp
index 256d0ed6..256d0ed6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31663-var_def_blks.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31663-var_def_blks.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31664-var_def_blks.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31664-var_def_blks.cpp
index c54e1c94..c54e1c94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31664-var_def_blks.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31664-var_def_blks.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31665-var_def_blks.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31665-var_def_blks.cpp
index e328c1db..e328c1db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31665-var_def_blks.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31665-var_def_blks.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31666-var_def_blks.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31666-var_def_blks.cpp
index 87f45a37..87f45a37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31666-var_def_blks.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31666-var_def_blks.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31667-var_def_blks.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31667-var_def_blks.cpp
index e1652f4a..e1652f4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31667-var_def_blks.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31667-var_def_blks.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31668-var_def_blks.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31668-var_def_blks.cpp
index d660b2c2..d660b2c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31668-var_def_blks.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31668-var_def_blks.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp
index 03615082..03615082 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp
index f67cb76b..f67cb76b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31702-toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31702-toggle_processing_cmt.cpp
index adf1b8be..adf1b8be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31702-toggle_processing_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31702-toggle_processing_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31703-toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31703-toggle_processing_cmt.cpp
index e806e89e..e806e89e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31703-toggle_processing_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31703-toggle_processing_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp
index 8350740b..8350740b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp
index 56f16799..56f16799 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31720-bit-colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31720-bit-colon.cpp
index b8e7c4db..b8e7c4db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31720-bit-colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31720-bit-colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31721-Issue_2689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31721-Issue_2689.cpp
index e2b43674..e2b43674 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31721-Issue_2689.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31721-Issue_2689.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31730-ms-style-ref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31730-ms-style-ref.cpp
index 826d4e90..826d4e90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31730-ms-style-ref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31730-ms-style-ref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31740-I2102.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31740-I2102.cpp
index d8cf883a..d8cf883a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/31740-I2102.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/31740-I2102.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp
index 99d403ef..99d403ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32001-issue_547_for_each.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32001-issue_547_for_each.cpp
index cfbe7963..cfbe7963 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32001-issue_547_for_each.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32001-issue_547_for_each.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32002-proto-wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32002-proto-wrap.cpp
index 35e8bea3..35e8bea3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32002-proto-wrap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32002-proto-wrap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32003-issue_633_typename.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32003-issue_633_typename.cpp
index 33b947f1..33b947f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32003-issue_633_typename.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32003-issue_633_typename.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32004-issue_624_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32004-issue_624_angle.cpp
index 255db223..255db223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32004-issue_624_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32004-issue_624_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32005-issue_633_typename.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32005-issue_633_typename.cpp
index 33b947f1..33b947f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32005-issue_633_typename.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32005-issue_633_typename.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32006-bug_i_687.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32006-bug_i_687.cpp
index 387eaa06..387eaa06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32006-bug_i_687.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32006-bug_i_687.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32007-Issue_3052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32007-Issue_3052.cpp
index cb468be3..cb468be3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32007-Issue_3052.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32007-Issue_3052.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32008-Issue_3034.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32008-Issue_3034.cpp
index 1a110ee8..1a110ee8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32008-Issue_3034.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32008-Issue_3034.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32009-Issue_3422.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32009-Issue_3422.cpp
index 66e5ddad..66e5ddad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32009-Issue_3422.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32009-Issue_3422.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32010-Issue_3422.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32010-Issue_3422.cpp
index 7077eb71..7077eb71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32010-Issue_3422.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32010-Issue_3422.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32100-cpp17.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32100-cpp17.cpp
index cfccba03..cfccba03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32100-cpp17.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32100-cpp17.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32105-I2103.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32105-I2103.cpp
index c35fbe56..c35fbe56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32105-I2103.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32105-I2103.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32115-2185.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32115-2185.cpp
index 6f874926..6f874926 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/32115-2185.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/32115-2185.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33000-tab-0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33000-tab-0.cpp
index d9ff0418..d9ff0418 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33000-tab-0.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33000-tab-0.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33001-tab-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33001-tab-1.cpp
index 85d8abe2..85d8abe2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33001-tab-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33001-tab-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33002-cmt_convert_tab_to_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33002-cmt_convert_tab_to_spaces.cpp
index 32ff32d3..32ff32d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33002-cmt_convert_tab_to_spaces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33002-cmt_convert_tab_to_spaces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33003-cmt_convert_tab_to_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33003-cmt_convert_tab_to_spaces.cpp
index db09e6fc..db09e6fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33003-cmt_convert_tab_to_spaces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33003-cmt_convert_tab_to_spaces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33004-DoxygenComments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33004-DoxygenComments.cpp
index df0b9680..df0b9680 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33004-DoxygenComments.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33004-DoxygenComments.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33005-DoxygenComments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33005-DoxygenComments.cpp
index 533214f2..533214f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33005-DoxygenComments.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33005-DoxygenComments.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp
index 8350740b..8350740b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33007-NewLine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33007-NewLine.cpp
index 9c7f1ee9..9c7f1ee9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33007-NewLine.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33007-NewLine.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33008-NewLine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33008-NewLine.cpp
index b3cc1bed..b3cc1bed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33008-NewLine.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33008-NewLine.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33009-NewLine0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33009-NewLine0.cpp
index b5a714fa..b5a714fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33009-NewLine0.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33009-NewLine0.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33010-Q_EMIT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33010-Q_EMIT.cpp
index d3ef9396..d3ef9396 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33010-Q_EMIT.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33010-Q_EMIT.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33011-static.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33011-static.h
index 8121fef1..8121fef1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33011-static.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33011-static.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp
index faf00903..faf00903 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33013-Q_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33013-Q_2.cpp
index 7d0bb88a..7d0bb88a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33013-Q_2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33013-Q_2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33014-DB.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33014-DB.cpp
index 1b8f4bc8..1b8f4bc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33014-DB.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33014-DB.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33015-Q_FOREACH.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33015-Q_FOREACH.cpp
index 02fd849d..02fd849d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33015-Q_FOREACH.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33015-Q_FOREACH.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33016-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33016-indent.cpp
index 22d04a78..22d04a78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33016-indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33016-indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33017-bug_1160.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33017-bug_1160.cpp
index 8dc7a9d1..8dc7a9d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33017-bug_1160.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33017-bug_1160.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33019-bug_657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33019-bug_657.cpp
index 3b5bb42a..3b5bb42a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33019-bug_657.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33019-bug_657.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33020-bug_662.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33020-bug_662.cpp
index 48b612ae..48b612ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33020-bug_662.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33020-bug_662.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33021-bug_633.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33021-bug_633.cpp
index 5b672b47..5b672b47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33021-bug_633.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33021-bug_633.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33022-bug_634.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33022-bug_634.cpp
index febbf7b3..febbf7b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33022-bug_634.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33022-bug_634.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33023-bug_651.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33023-bug_651.cpp
index f0236016..f0236016 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33023-bug_651.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33023-bug_651.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33024-bug_653.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33024-bug_653.cpp
index 1bf853d6..1bf853d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33024-bug_653.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33024-bug_653.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33025-bug_654.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33025-bug_654.cpp
index 497e3372..497e3372 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33025-bug_654.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33025-bug_654.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33026-bug_631.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33026-bug_631.cpp
index e110d383..e110d383 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33026-bug_631.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33026-bug_631.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33027-bug_664.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33027-bug_664.cpp
index 6fa5beea..6fa5beea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33027-bug_664.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33027-bug_664.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33028-braces_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33028-braces_empty.cpp
index 8e46ab7c..8e46ab7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33028-braces_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33028-braces_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33029-cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33029-cast.cpp
index 67e725ff..67e725ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33029-cast.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33029-cast.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33030-Q_FOREVER.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33030-Q_FOREVER.cpp
index 5dad4fa9..5dad4fa9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33030-Q_FOREVER.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33030-Q_FOREVER.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33031-bug_612.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33031-bug_612.cpp
index 4388ac75..4388ac75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33031-bug_612.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33031-bug_612.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33032-bug_670.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33032-bug_670.cpp
index 0ede02f2..0ede02f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33032-bug_670.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33032-bug_670.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33033-bug_670.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33033-bug_670.h
index cc6d46e3..cc6d46e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33033-bug_670.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33033-bug_670.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33034-bug_671.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33034-bug_671.h
index 5ef3b5d9..5ef3b5d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33034-bug_671.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33034-bug_671.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33035-patch_32.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33035-patch_32.cpp
index 8b414f00..8b414f00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33035-patch_32.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33035-patch_32.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33036-bug_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33036-bug_663.cpp
index 7583d548..7583d548 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33036-bug_663.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33036-bug_663.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33037-func_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33037-func_class.cpp
index ea271c11..ea271c11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33037-func_class.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33037-func_class.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33038-func_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33038-func_class.h
index 8b3ca218..8b3ca218 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33038-func_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33038-func_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp
index 707c1c38..707c1c38 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33040-bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33040-bug_i_411.cpp
index 5a3f09aa..5a3f09aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33040-bug_i_411.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33040-bug_i_411.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33041-bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33041-bug_i_411.cpp
index 4e89d68d..4e89d68d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33041-bug_i_411.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33041-bug_i_411.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33042-bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33042-bug_i_411.cpp
index 574f12ba..574f12ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33042-bug_i_411.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33042-bug_i_411.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33043-bug_i_478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33043-bug_i_478.cpp
index 868220bb..868220bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33043-bug_i_478.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33043-bug_i_478.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33044-bug_i_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33044-bug_i_481.cpp
index e8470648..e8470648 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33044-bug_i_481.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33044-bug_i_481.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33045-bug_i_width.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33045-bug_i_width.cpp
index 08f7888e..08f7888e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33045-bug_i_width.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33045-bug_i_width.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33046-bug_i_409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33046-bug_i_409.cpp
index 6946a562..6946a562 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33046-bug_i_409.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33046-bug_i_409.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33047-bug_i_409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33047-bug_i_409.cpp
index 7bfdfd83..7bfdfd83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33047-bug_i_409.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33047-bug_i_409.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33048-bug_i_405.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33048-bug_i_405.cpp
index eda9b0dd..eda9b0dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33048-bug_i_405.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33048-bug_i_405.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33049-pp-pragma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33049-pp-pragma.cpp
index 2c013b08..2c013b08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33049-pp-pragma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33049-pp-pragma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33050-issue_523.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33050-issue_523.cpp
index d203e398..d203e398 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33050-issue_523.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33050-issue_523.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33051-bug_i_503.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33051-bug_i_503.cpp
index 31ca41a8..31ca41a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33051-bug_i_503.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33051-bug_i_503.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33052-bug_i_512.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33052-bug_i_512.cpp
index 9b93cdf2..9b93cdf2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33052-bug_i_512.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33052-bug_i_512.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33053-for_auto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33053-for_auto.cpp
index 073556c9..073556c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33053-for_auto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33053-for_auto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33054-bug_i_825.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33054-bug_i_825.cpp
index 242c4811..242c4811 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33054-bug_i_825.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33054-bug_i_825.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33056-bug_33056.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33056-bug_33056.cpp
index 1339ede1..1339ede1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33056-bug_33056.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33056-bug_33056.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33057-bug_1349.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33057-bug_1349.cpp
index fcc2e567..fcc2e567 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33057-bug_1349.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33057-bug_1349.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33058-Issue_3164.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33058-Issue_3164.cpp
index a1e426b0..a1e426b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33058-Issue_3164.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33058-Issue_3164.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33059-mod_remove_empty_return-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33059-mod_remove_empty_return-2.cpp
index eb949c45..eb949c45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33059-mod_remove_empty_return-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33059-mod_remove_empty_return-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33060-if_constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33060-if_constexpr.cpp
index 032f74ec..032f74ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33060-if_constexpr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33060-if_constexpr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33061-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33061-if_chain_braces.cpp
index 693efc63..693efc63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33061-if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33061-if_chain_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33062-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33062-if_chain_braces.cpp
index af36ed0e..af36ed0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33062-if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33062-if_chain_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33063-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33063-if_chain_braces.cpp
index 00038700..00038700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33063-if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33063-if_chain_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33064-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33064-if_chain_braces.cpp
index c42ef73a..c42ef73a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33064-if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33064-if_chain_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33065-Issue_3316.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33065-Issue_3316.cpp
index 91ec82f0..91ec82f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33065-Issue_3316.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33065-Issue_3316.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33066-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33066-if_chain_braces.cpp
index 0ef6478b..0ef6478b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33066-if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33066-if_chain_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33067-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33067-if_chain_braces.cpp
index 7df1c6e8..7df1c6e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33067-if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33067-if_chain_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33069-Issue_2195.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33069-Issue_2195.cpp
index fe3ec459..fe3ec459 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33069-Issue_2195.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33069-Issue_2195.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33070-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33070-multi_line.cpp
index dcea4c00..dcea4c00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33070-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33070-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33071-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33071-multi_line.cpp
index 0f8503fc..0f8503fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33071-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33071-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33072-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33072-multi_line.cpp
index add93503..add93503 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33072-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33072-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33073-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33073-multi_line.cpp
index c0016ff6..c0016ff6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33073-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33073-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33074-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33074-multi_line.cpp
index c8f32960..c8f32960 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33074-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33074-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33075-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33075-multi_line.cpp
index 66963f4e..66963f4e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33075-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33075-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33076-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33076-multi_line.cpp
index 9d105267..9d105267 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33076-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33076-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33077-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33077-multi_line.cpp
index d7cbafc8..d7cbafc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33077-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33077-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33078-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33078-multi_line.cpp
index 01fe4d10..01fe4d10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33078-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33078-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33079-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33079-multi_line.cpp
index 6a6490ab..6a6490ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33079-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33079-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33080-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33080-multi_line.cpp
index 8f44ce91..8f44ce91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33080-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33080-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33081-bug_i_552.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33081-bug_i_552.cpp
index 5a0704de..5a0704de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33081-bug_i_552.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33081-bug_i_552.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33082-namespace_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33082-namespace_namespace.cpp
index cf6f921e..cf6f921e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33082-namespace_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33082-namespace_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33083-bug_i_359.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33083-bug_i_359.cpp
index 8081c1f9..8081c1f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33083-bug_i_359.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33083-bug_i_359.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33084-op_sym_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33084-op_sym_empty.cpp
index 3557e513..3557e513 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33084-op_sym_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33084-op_sym_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33085-bug_i_323.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33085-bug_i_323.cpp
index 6f622f6e..6f622f6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33085-bug_i_323.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33085-bug_i_323.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33086-bug_i_568.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33086-bug_i_568.cpp
index 55da09f3..55da09f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33086-bug_i_568.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33086-bug_i_568.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33087-bug_i_596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33087-bug_i_596.cpp
index db3644a2..db3644a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33087-bug_i_596.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33087-bug_i_596.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33088-bug_i_197.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33088-bug_i_197.cpp
index e86698fd..e86698fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33088-bug_i_197.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33088-bug_i_197.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33089-bug_643.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33089-bug_643.cpp
index 55e3e309..55e3e309 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33089-bug_643.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33089-bug_643.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33090-gh555.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33090-gh555.cpp
index 32147190..32147190 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33090-gh555.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33090-gh555.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33091-squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33091-squeeze_ifdef.cpp
index 7311c71e..7311c71e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33091-squeeze_ifdef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33091-squeeze_ifdef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33092-squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33092-squeeze_ifdef.cpp
index 94b20d2e..94b20d2e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33092-squeeze_ifdef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33092-squeeze_ifdef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33093-sp_angle_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33093-sp_angle_paren.cpp
index 7ed4f34e..7ed4f34e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33093-sp_angle_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33093-sp_angle_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33094-sp_angle_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33094-sp_angle_paren.cpp
index c20305c3..c20305c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33094-sp_angle_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33094-sp_angle_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33095-bug_i_322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33095-bug_i_322.cpp
index 3904ec27..3904ec27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33095-bug_i_322.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33095-bug_i_322.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33096-squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33096-squeeze_ifdef.cpp
index df3d90ab..df3d90ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33096-squeeze_ifdef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33096-squeeze_ifdef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33097-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33097-enum_comma.h
index bb93f4a9..bb93f4a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33097-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33097-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33098-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33098-enum_comma.h
index 3ec29719..3ec29719 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33098-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33098-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33099-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33099-enum_comma.h
index 01a89059..01a89059 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33099-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33099-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33100-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33100-enum_comma.h
index 903a6849..903a6849 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33100-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33100-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33101-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33101-enum_comma.h
index 53c1a99e..53c1a99e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33101-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33101-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33102-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33102-enum_comma.h
index 6c11f2b3..6c11f2b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33102-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33102-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33103-bug_858.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33103-bug_858.cpp
index 1085f7db..1085f7db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33103-bug_858.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33103-bug_858.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33104-bug_858.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33104-bug_858.cpp
index c5ac560e..c5ac560e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33104-bug_858.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33104-bug_858.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33105-bug_1001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33105-bug_1001.cpp
index d6104cd5..d6104cd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33105-bug_1001.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33105-bug_1001.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33106-pos_bool_in_template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33106-pos_bool_in_template.h
index f5fdb04e..f5fdb04e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33106-pos_bool_in_template.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33106-pos_bool_in_template.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33107-Issue_2688.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33107-Issue_2688.cpp
index ac97ff3a..ac97ff3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33107-Issue_2688.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33107-Issue_2688.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33108-Issue_2045.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33108-Issue_2045.cpp
index a1670ffc..a1670ffc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33108-Issue_2045.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33108-Issue_2045.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33109-Issue_3205.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33109-Issue_3205.cpp
index 99767289..99767289 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33109-Issue_3205.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33109-Issue_3205.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33110-enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33110-enum.cpp
index b4f7df56..10df5456 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33110-enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33110-enum.cpp
@@ -148,8 +148,8 @@ enum log_sev_t
    LINDENTAG = 88, /* indent again */
    LNFD      = 89, /* newline-function-def */
    LJDBI     = 90, /* Java Double Brace Init */
-   LSETPAR   = 91, /* Chunk::SetParentTypeReal() */
-   LSETTYP   = 92, /* Chunk::SetTypeReal() */
+   LSETPAR   = 91, /* Chunk::SetParentType() */
+   LSETTYP   = 92, /* Chunk::SetType() */
    LSETFLG   = 93, /* set_chunk_flags() */
    LNLFUNCT  = 94, /* newlines before function */
    LCHUNK    = 95, /* Add or del chunk */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33120-Issue_2149.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33120-Issue_2149.cpp
index 1266bd7b..1266bd7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33120-Issue_2149.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33120-Issue_2149.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33150-bug_i_753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33150-bug_i_753.cpp
index 9aa764a4..9aa764a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33150-bug_i_753.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33150-bug_i_753.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33151-bug_i_752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33151-bug_i_752.cpp
index da8fe9f5..da8fe9f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33151-bug_i_752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33151-bug_i_752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33152-bug_1004.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33152-bug_1004.cpp
index f072a583..f072a583 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33152-bug_1004.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33152-bug_1004.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33160-bug_1112.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33160-bug_1112.cpp
index da95fcb6..da95fcb6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33160-bug_1112.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33160-bug_1112.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33161-byref-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33161-byref-3.cpp
index 8c51bf46..8c51bf46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33161-byref-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33161-byref-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33162-sp_not_not.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33162-sp_not_not.cpp
index 42306dad..42306dad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33162-sp_not_not.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33162-sp_not_not.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33180-pp_multi_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33180-pp_multi_comment.cpp
index bfe1e1d1..bfe1e1d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33180-pp_multi_comment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33180-pp_multi_comment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33181-Issue_2759.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33181-Issue_2759.cpp
index cbe9c4a5..cbe9c4a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33181-Issue_2759.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33181-Issue_2759.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33182-Issue_2794.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33182-Issue_2794.cpp
index 16de515b..16de515b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33182-Issue_2794.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33182-Issue_2794.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33200-first_len_minimum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33200-first_len_minimum.cpp
index c33d9e03..c33d9e03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33200-first_len_minimum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33200-first_len_minimum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp
index 3b1bea1c..3b1bea1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33202-initlist_leading_commas.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33202-initlist_leading_commas.cpp
index a3bc4a2a..a3bc4a2a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33202-initlist_leading_commas.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33202-initlist_leading_commas.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33203-Issue_2574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33203-Issue_2574.cpp
index bd88347d..bd88347d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33203-Issue_2574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33203-Issue_2574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33204-Issue_2582.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33204-Issue_2582.cpp
index adf9bfe9..adf9bfe9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33204-Issue_2582.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33204-Issue_2582.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33205-Issue_3198.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33205-Issue_3198.cpp
index 8dd234b7..8dd234b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33205-Issue_3198.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33205-Issue_3198.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33210-templates4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33210-templates4.cpp
index 10b96e4a..10b96e4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33210-templates4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33210-templates4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33211-pp_multi_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33211-pp_multi_comment.cpp
index 5690e3a6..5690e3a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33211-pp_multi_comment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33211-pp_multi_comment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33212-pp-define-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33212-pp-define-indent.cpp
index 78dc4c98..78dc4c98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33212-pp-define-indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33212-pp-define-indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33213-disable_macro.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33213-disable_macro.cpp
index 7e64f416..7e64f416 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33213-disable_macro.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33213-disable_macro.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33214-Issue_2742.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33214-Issue_2742.cpp
index 66d12fec..66d12fec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33214-Issue_2742.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33214-Issue_2742.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33215-Issue_3055.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33215-Issue_3055.cpp
index d23a0d56..d23a0d56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33215-Issue_3055.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33215-Issue_3055.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33216-Issue_3055-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33216-Issue_3055-a.cpp
index 21a5c35c..21a5c35c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33216-Issue_3055-a.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33216-Issue_3055-a.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33217-Issue_3113.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33217-Issue_3113.cpp
index 63090f4a..63090f4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/33217-Issue_3113.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/33217-Issue_3113.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34001-nl_before_after.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34001-nl_before_after.h
index 8cdc7273..8cdc7273 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34001-nl_before_after.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34001-nl_before_after.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34002-bug_i_793.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34002-bug_i_793.cpp
index b6b6a7ab..b6b6a7ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34002-bug_i_793.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34002-bug_i_793.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34003-nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34003-nl_max_blank_in_func.cpp
index cd1083ee..cd1083ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34003-nl_max_blank_in_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34003-nl_max_blank_in_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34004-nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34004-nl_max_blank_in_func.cpp
index c2f8dc36..c2f8dc36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34004-nl_max_blank_in_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34004-nl_max_blank_in_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34005-nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34005-nl_max_blank_in_func.cpp
index 738f3bf6..738f3bf6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34005-nl_max_blank_in_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34005-nl_max_blank_in_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34006-bug_i_575.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34006-bug_i_575.cpp
index 4c25fb75..4c25fb75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34006-bug_i_575.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34006-bug_i_575.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34007-bug_i_928.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34007-bug_i_928.cpp
index 78b214bd..78b214bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34007-bug_i_928.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34007-bug_i_928.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34100-bug_i_525.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34100-bug_i_525.cpp
index b810afe0..b810afe0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34100-bug_i_525.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34100-bug_i_525.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34101-bug_i_646.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34101-bug_i_646.cpp
index f89b6416..f89b6416 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34101-bug_i_646.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34101-bug_i_646.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34105-bug_i_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34105-bug_i_663.cpp
index 2a473bc7..2a473bc7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34105-bug_i_663.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34105-bug_i_663.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34108-bug_i_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34108-bug_i_666.cpp
index 212a8656..212a8656 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34108-bug_i_666.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34108-bug_i_666.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34112-bug_i_889.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34112-bug_i_889.cpp
index 5b803a0e..5b803a0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34112-bug_i_889.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34112-bug_i_889.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34113-bug_902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34113-bug_902.cpp
index ada480c0..ada480c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34113-bug_902.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34113-bug_902.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34114-bug_902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34114-bug_902.cpp
index af6bdb44..af6bdb44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34114-bug_902.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34114-bug_902.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34115-nl_before_func_body_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34115-nl_before_func_body_def.cpp
index ff76cb2b..ff76cb2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34115-nl_before_func_body_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34115-nl_before_func_body_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34116-issue_2000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34116-issue_2000.cpp
index f4f2c2bf..f4f2c2bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34116-issue_2000.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34116-issue_2000.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34117-extern_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34117-extern_func.cpp
index 4de29e3c..4de29e3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34117-extern_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34117-extern_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34118-Issue_2163.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34118-Issue_2163.cpp
index afd04eb0..afd04eb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34118-Issue_2163.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34118-Issue_2163.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34120-bug_i_999.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34120-bug_i_999.cpp
index 2a5d64a4..2a5d64a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34120-bug_i_999.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34120-bug_i_999.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34121-bug_1717.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34121-bug_1717.cpp
index 4116871f..4116871f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34121-bug_1717.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34121-bug_1717.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34122-Issue_2440.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34122-Issue_2440.cpp
index c52c30da..c52c30da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34122-Issue_2440.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34122-Issue_2440.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34123-Issue_2440_nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34123-Issue_2440_nl.cpp
index c52c30da..c52c30da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34123-Issue_2440_nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34123-Issue_2440_nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34130-bug_i_1000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34130-bug_i_1000.cpp
index 6e1e7a0e..6e1e7a0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34130-bug_i_1000.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34130-bug_i_1000.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34131-bug_i_1000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34131-bug_i_1000.cpp
index 149353e7..149353e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34131-bug_i_1000.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34131-bug_i_1000.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34132-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34132-new_op.cpp
index 15386247..15386247 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34132-new_op.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34132-new_op.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34133-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34133-new_op.cpp
index ce690c94..ce690c94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34133-new_op.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34133-new_op.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34134-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34134-new_op.cpp
index 67dfa187..67dfa187 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34134-new_op.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34134-new_op.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34135-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34135-new_op.cpp
index 044cd859..044cd859 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34135-new_op.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34135-new_op.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp
index 0a6635d0..0a6635d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34140-bug_1027.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34140-bug_1027.cpp
index 5ccafd2b..5ccafd2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34140-bug_1027.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34140-bug_1027.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34141-bug_1005.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34141-bug_1005.cpp
index 01a457d0..01a457d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34141-bug_1005.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34141-bug_1005.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34142-I1112-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34142-I1112-1.cpp
index df27d1d6..df27d1d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34142-I1112-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34142-I1112-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34143-I1112-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34143-I1112-2.cpp
index 28a4489d..28a4489d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34143-I1112-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34143-I1112-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34144-I1112-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34144-I1112-3.cpp
index c95a6c40..c95a6c40 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34144-I1112-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34144-I1112-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34145-i683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34145-i683.cpp
index 255c6336..255c6336 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34145-i683.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34145-i683.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34146-bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34146-bug_1002.cpp
index 0d72c80a..0d72c80a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34146-bug_1002.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34146-bug_1002.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34147-bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34147-bug_1002.cpp
index 02b85396..02b85396 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34147-bug_1002.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34147-bug_1002.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34148-bug_1139.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34148-bug_1139.cpp
index 11a11a77..11a11a77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34148-bug_1139.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34148-bug_1139.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34149-bug_1139.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34149-bug_1139.cpp
index 88243de7..88243de7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34149-bug_1139.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34149-bug_1139.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34150-bug_1032.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34150-bug_1032.cpp
index 80078efe..80078efe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34150-bug_1032.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34150-bug_1032.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34151-bug_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34151-bug_666.cpp
index 212a8656..212a8656 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34151-bug_666.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34151-bug_666.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34152-bug_1068.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34152-bug_1068.cpp
index 74fbc8e7..74fbc8e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34152-bug_1068.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34152-bug_1068.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34153-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34153-type_brace_init_lst.cpp
index 356a7713..356a7713 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34153-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34153-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34154-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34154-type_brace_init_lst.cpp
index adc09173..adc09173 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34154-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34154-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34155-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34155-type_brace_init_lst.cpp
index 7d62eafb..7d62eafb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34155-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34155-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34156-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34156-type_brace_init_lst.cpp
index 6519b4b1..6519b4b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34156-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34156-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34157-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34157-type_brace_init_lst.cpp
index 6751c0fa..6751c0fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34157-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34157-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34158-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34158-type_brace_init_lst.cpp
index d5dcfdeb..d5dcfdeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34158-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34158-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34159-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34159-type_brace_init_lst.cpp
index 0b9bf31c..0b9bf31c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34159-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34159-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34160-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34160-type_brace_init_lst.cpp
index 01c89132..01c89132 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34160-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34160-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34161-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34161-type_brace_init_lst.cpp
index cc79678f..cc79678f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34161-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34161-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34162-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34162-type_brace_init_lst.cpp
index 2d5dc62c..2d5dc62c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34162-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34162-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34163-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34163-type_brace_init_lst.cpp
index 9be7507a..9be7507a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34163-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34163-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34164-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34164-type_brace_init_lst.cpp
index 68565614..68565614 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34164-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34164-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34165-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34165-type_brace_init_lst.cpp
index 92fc0b0b..92fc0b0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34165-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34165-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34166-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34166-type_brace_init_lst.cpp
index d7dfa908..d7dfa908 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34166-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34166-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34168-Issue_2910.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34168-Issue_2910.cpp
index 82c2bec9..82c2bec9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34168-Issue_2910.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34168-Issue_2910.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34169-init-list-call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34169-init-list-call.cpp
index 95449eb1..95449eb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34169-init-list-call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34169-init-list-call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34170-i1082.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34170-i1082.cpp
index 06680c0e..06680c0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34170-i1082.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34170-i1082.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34171-i1181.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34171-i1181.cpp
index 1a959d34..1a959d34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34171-i1181.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34171-i1181.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34172-i1165.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34172-i1165.cpp
index c3123b59..c3123b59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34172-i1165.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34172-i1165.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34173-i1464.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34173-i1464.cpp
index 179ecd5e..179ecd5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34173-i1464.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34173-i1464.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34174-i1466.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34174-i1466.cpp
index fe704d2a..fe704d2a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34174-i1466.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34174-i1466.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34175-i1509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34175-i1509.cpp
index 419807fd..419807fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34175-i1509.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34175-i1509.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp
index b9a75cf6..b9a75cf6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34177-sp_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34177-sp_func_call_paren.cpp
index 580e9bae..580e9bae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34177-sp_func_call_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34177-sp_func_call_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34178-Issue_3237.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34178-Issue_3237.cpp
index 23b565a9..23b565a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34178-Issue_3237.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34178-Issue_3237.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34179-arith_vs_byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34179-arith_vs_byref.cpp
index f459fdcc..f459fdcc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34179-arith_vs_byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34179-arith_vs_byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34180-bug_1402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34180-bug_1402.cpp
index 09714c41..09714c41 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34180-bug_1402.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34180-bug_1402.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34190-bug_1003.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34190-bug_1003.cpp
index 7495b93d..7495b93d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34190-bug_1003.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34190-bug_1003.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34191-comment-align-multiline.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34191-comment-align-multiline.cpp
index db501481..db501481 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34191-comment-align-multiline.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34191-comment-align-multiline.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34192-i1207.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34192-i1207.cpp
index e02da8c9..e02da8c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34192-i1207.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34192-i1207.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34193-i1218.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34193-i1218.cpp
index d4d05106..d4d05106 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34193-i1218.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34193-i1218.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34194-sp_arith_additive.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34194-sp_arith_additive.cpp
index 5ecb2ec8..5ecb2ec8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34194-sp_arith_additive.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34194-sp_arith_additive.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34195-sp_arith_additive.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34195-sp_arith_additive.cpp
index f419a3ed..f419a3ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34195-sp_arith_additive.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34195-sp_arith_additive.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34196-Issue_1460.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34196-Issue_1460.h
index 63787999..63787999 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34196-Issue_1460.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34196-Issue_1460.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34197-bug_1161.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34197-bug_1161.cpp
index 34740f5a..34740f5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34197-bug_1161.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34197-bug_1161.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34198-bug_1249.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34198-bug_1249.cpp
index 65637efe..65637efe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34198-bug_1249.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34198-bug_1249.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34199-not_lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34199-not_lambda.cpp
index a9c65439..a9c65439 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34199-not_lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34199-not_lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34200-i1536.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34200-i1536.cpp
index 0eb7fc69..0eb7fc69 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34200-i1536.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34200-i1536.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34201-i1565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34201-i1565.cpp
index c787f163..c787f163 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34201-i1565.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34201-i1565.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34202-i1617.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34202-i1617.cpp
index 98ede13b..98ede13b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34202-i1617.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34202-i1617.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34203-i1516.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34203-i1516.cpp
index d0612a2b..d0612a2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34203-i1516.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34203-i1516.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34204-func_param_indent_leading_comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34204-func_param_indent_leading_comma.cpp
index e8790dbd..e8790dbd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34204-func_param_indent_leading_comma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34204-func_param_indent_leading_comma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34205-bug_1395.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34205-bug_1395.cpp
index 16e2fbba..16e2fbba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34205-bug_1395.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34205-bug_1395.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34206-for_loop_head.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34206-for_loop_head.cpp
index 6cea550d..6cea550d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34206-for_loop_head.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34206-for_loop_head.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34207-for_loop_head.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34207-for_loop_head.cpp
index 2aa9bdc0..2aa9bdc0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34207-for_loop_head.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34207-for_loop_head.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34208-conversion_operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34208-conversion_operator.cpp
index 27b52dac..27b52dac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34208-conversion_operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34208-conversion_operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34209-lambda_selfcalling.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34209-lambda_selfcalling.cpp
index 8f0c819e..8f0c819e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34209-lambda_selfcalling.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34209-lambda_selfcalling.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34210-override_virtual.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34210-override_virtual.cpp
index 537454b1..537454b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34210-override_virtual.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34210-override_virtual.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34211-anonymous_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34211-anonymous_enum.cpp
index ef237a6e..ef237a6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34211-anonymous_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34211-anonymous_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34212-func_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34212-func_class.h
index 2035b634..2035b634 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34212-func_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34212-func_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34250-bug_1607.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34250-bug_1607.cpp
index 9e4e47d3..9e4e47d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34250-bug_1607.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34250-bug_1607.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34251-bug_1649.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34251-bug_1649.cpp
index 4b352c79..4b352c79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34251-bug_1649.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34251-bug_1649.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34252-issue_2001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34252-issue_2001.cpp
index 39b9446d..39b9446d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34252-issue_2001.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34252-issue_2001.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34253-friends.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34253-friends.cpp
index 58fd649a..58fd649a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34253-friends.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34253-friends.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34254-issue_1985.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34254-issue_1985.cpp
index ef9fc90a..ef9fc90a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34254-issue_1985.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34254-issue_1985.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34255-eat_blanks_after_codewidth.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34255-eat_blanks_after_codewidth.cpp
index 7005d86c..7005d86c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34255-eat_blanks_after_codewidth.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34255-eat_blanks_after_codewidth.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34256-Issue_2836.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34256-Issue_2836.cpp
index 4d2a648f..4d2a648f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34256-Issue_2836.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34256-Issue_2836.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34257-brace_init_stdint_macros.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34257-brace_init_stdint_macros.cpp
index 976eb454..976eb454 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34257-brace_init_stdint_macros.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34257-brace_init_stdint_macros.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34258-long_lines.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34258-long_lines.cpp
new file mode 100644
index 00000000..d92ea108
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34258-long_lines.cpp
@@ -0,0 +1,34 @@
+void main()
+{
+	if (true)
+	{
+		// Output the coordinates of the icon
+		snprintf(&ret[strlen(ret)], ret_max - strlen(ret), "\nx=\"0px\"\ny=\"0px\"\n");
+		snprintf(&ret[strlen(ret)], ret_max - strlen(ret), "width=\"%d\"\n", icon->icon_width);
+		snprintf(&ret[strlen(ret)], ret_max - strlen(ret), "height=\"%d\"\n", icon->icon_height);
+		snprintf(&ret[strlen(ret)], ret_max - strlen(ret), "viewBox=\"%lf %lf %lf %lf\"\n", icon->x,
+		        icon->y, icon->width, icon->height);
+
+		snprintf(&ret[strlen(ret)], ret_max - strlen(ret), icon->x, icon->y,
+		        bar("viewBox=\"%lf %lf %lf %lf\"\n", icon->width), icon->height);
+
+		snprintf(&ret[strlen(ret)], ret_max - strlen(ret), "viewBox=\"%lf %lf %lf %lf\"\n", icon->x,
+		        icon->y, icon->width, icon->height);
+		snprintf(&ret[strlen(ret)], ret_max - strlen(ret), "viewBox=\"%lf %lf %lf %lf\"\n",
+		        foo(icon->x, icon->y, icon->width), icon->height);
+		snprintf(&ret[strlen(ret)], ret_max - strlen(ret), icon->x, icon->y,
+		        bar("viewBox=\"%lf %lf %lf %lf\"\n", icon->width), icon->height);
+		snprintf(&ret[strlen(ret)], ret_max - foo(ret, par), icon->x, icon->y,
+		        bar("viewBox=\"%lf %lf %lf %lf\"\n", icon->width), icon->height);
+
+		create_a_reeeeeeeeeeeeeeeeeeeeeeeeeeeeally_long_identifier name(some_function(bar1 + bar2),
+		        bar3, bar4);
+		create_a_reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeally_long_identifier name(some_function(
+		        bar1 + bar2), bar3, bar4);
+
+		abc.def.ghi = call_some_other_really_long_function.of_some_sort_of_very_very_very_loooooooooong(
+		        some_long_parameter1, some_long_parameter2);
+	}
+}
+
+#define FOO(bar) create_a_really_long_identifier name(some_function(bar1 + bar2), bar3, bar4);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34280-UNI-29935.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34280-UNI-29935.cpp
index 28d0b66d..28d0b66d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34280-UNI-29935.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34280-UNI-29935.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp
index 19c4b962..19c4b962 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp
index aed91c1b..aed91c1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp
index cc0ac847..cc0ac847 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp
index c47119ab..c47119ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp
index afe3a0ec..afe3a0ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp
index 9b8ea3c5..9b8ea3c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34296-i1768.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34296-i1768.cpp
index 94327d9c..94327d9c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34296-i1768.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34296-i1768.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34297-align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34297-align-assign-mixed.cpp
index d8082600..d8082600 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34297-align-assign-mixed.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34297-align-assign-mixed.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34298-align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34298-align-assign-mixed.cpp
index 4f8dadde..4f8dadde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34298-align-assign-mixed.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34298-align-assign-mixed.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34299-align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34299-align-assign-mixed.cpp
index ddae789b..ddae789b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34299-align-assign-mixed.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34299-align-assign-mixed.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34300-bug_1236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34300-bug_1236.cpp
index 8acaaed2..8acaaed2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34300-bug_1236.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34300-bug_1236.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34301-nl_fdef_brace_cond-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34301-nl_fdef_brace_cond-f.cpp
index 05aaf7c8..05aaf7c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34301-nl_fdef_brace_cond-f.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34301-nl_fdef_brace_cond-f.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34302-nl_fdef_brace_cond-r.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34302-nl_fdef_brace_cond-r.cpp
index 8a35c775..8a35c775 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34302-nl_fdef_brace_cond-r.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34302-nl_fdef_brace_cond-r.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34303-nl_fdef_brace_cond-fr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34303-nl_fdef_brace_cond-fr.cpp
index e498a669..e498a669 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34303-nl_fdef_brace_cond-fr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34303-nl_fdef_brace_cond-fr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34304-nl_fdef_brace_cond-rf.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34304-nl_fdef_brace_cond-rf.cpp
index 078e070a..078e070a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34304-nl_fdef_brace_cond-rf.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34304-nl_fdef_brace_cond-rf.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34305-issue_2124-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34305-issue_2124-1.cpp
index bad0ea55..bad0ea55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34305-issue_2124-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34305-issue_2124-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34306-issue_2124-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34306-issue_2124-2.cpp
index bad0ea55..bad0ea55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34306-issue_2124-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34306-issue_2124-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34307-2203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34307-2203.cpp
index 70a1f31a..70a1f31a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34307-2203.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34307-2203.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34308-enum_comment_wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34308-enum_comment_wrap.cpp
index 736e6718..736e6718 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34308-enum_comment_wrap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34308-enum_comment_wrap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34309-issue_2209-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34309-issue_2209-1.cpp
index 82ff67c6..82ff67c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34309-issue_2209-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34309-issue_2209-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34310-issue_2209-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34310-issue_2209-2.cpp
index 26c579d3..26c579d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34310-issue_2209-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34310-issue_2209-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34311-Issue_2250.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34311-Issue_2250.cpp
index 9268c2e3..9268c2e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34311-Issue_2250.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34311-Issue_2250.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34312-Issue_2101.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34312-Issue_2101.cpp
index 3e07c686..3e07c686 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34312-Issue_2101.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34312-Issue_2101.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34313-Issue_2437.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34313-Issue_2437.cpp
index 77a273ef..77a273ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34313-Issue_2437.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34313-Issue_2437.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34314-Issue_2604.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34314-Issue_2604.cpp
index eb87fc8a..eb87fc8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34314-Issue_2604.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34314-Issue_2604.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp
index c4f1a119..c4f1a119 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp
index 1bbde49b..1bbde49b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp
index e0d3488a..e0d3488a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34318-align_assign_func_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34318-align_assign_func_proto.cpp
index 1c003058..1c003058 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34318-align_assign_func_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34318-align_assign_func_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp
index 8a9df8b4..8a9df8b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp
index 432a9e3e..432a9e3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34321-bug_2285.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34321-bug_2285.cpp
index a456e9be..a456e9be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34321-bug_2285.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34321-bug_2285.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34322-issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34322-issue_2623.cpp
index a9566447..a9566447 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34322-issue_2623.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34322-issue_2623.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34323-issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34323-issue_2623.cpp
index 72fd90e8..72fd90e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34323-issue_2623.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34323-issue_2623.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34324-issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34324-issue_2623.cpp
index 61961fa1..61961fa1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34324-issue_2623.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34324-issue_2623.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34325-Issue_3025.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34325-Issue_3025.cpp
index 9e64526e..9e64526e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34325-Issue_3025.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34325-Issue_3025.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34326-Issue_3040.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34326-Issue_3040.cpp
index f9e69333..f9e69333 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34326-Issue_3040.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34326-Issue_3040.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34327-Issue_3044.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34327-Issue_3044.cpp
index 799fd0a1..799fd0a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34327-Issue_3044.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34327-Issue_3044.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34328-Issue_3048.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34328-Issue_3048.cpp
index fb6b0d38..fb6b0d38 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34328-Issue_3048.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34328-Issue_3048.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34330-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34330-Issue_3061_0nl.cpp
index d46f2655..f276710e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34330-Issue_3061_0nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34330-Issue_3061_0nl.cpp
@@ -1,13 +1,16 @@
 DCOPClient::DCOPClient()
 {
     TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
+        &d->postMessageTimer,
+        TQT_SIGNAL(timeout()),
+        this,
         TQT_SLOT(
             processPostedMessagesInternal()));
     TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
+        &d->eventLoopTimer,
+        TQT_SIGNAL(timeout()),
+        this,
+        TQT_SLOT(
             eventLoopTimeout()));
 }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34331-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34331-Issue_3061_1nl.cpp
index d46f2655..f276710e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34331-Issue_3061_1nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34331-Issue_3061_1nl.cpp
@@ -1,13 +1,16 @@
 DCOPClient::DCOPClient()
 {
     TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
+        &d->postMessageTimer,
+        TQT_SIGNAL(timeout()),
+        this,
         TQT_SLOT(
             processPostedMessagesInternal()));
     TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
+        &d->eventLoopTimer,
+        TQT_SIGNAL(timeout()),
+        this,
+        TQT_SLOT(
             eventLoopTimeout()));
 }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34332-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34332-Issue_3061_2nl.cpp
index d46f2655..f276710e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34332-Issue_3061_2nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34332-Issue_3061_2nl.cpp
@@ -1,13 +1,16 @@
 DCOPClient::DCOPClient()
 {
     TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
+        &d->postMessageTimer,
+        TQT_SIGNAL(timeout()),
+        this,
         TQT_SLOT(
             processPostedMessagesInternal()));
     TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
+        &d->eventLoopTimer,
+        TQT_SIGNAL(timeout()),
+        this,
+        TQT_SLOT(
             eventLoopTimeout()));
 }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34333-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34333-Issue_3061_0nl.cpp
index ef73253e..38af2ebd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34333-Issue_3061_0nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34333-Issue_3061_0nl.cpp
@@ -1,13 +1,16 @@
 DCOPClient::DCOPClient()
 {
     TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
+        &d->postMessageTimer,
+        TQT_SIGNAL(timeout()),
+        this,
         TQT_SLOT(
             processPostedMessagesInternal()));
     TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
+        &d->eventLoopTimer,
+        TQT_SIGNAL(timeout()),
+        this,
+        TQT_SLOT(
             eventLoopTimeout()));
 }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34334-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34334-Issue_3061_1nl.cpp
index ef73253e..38af2ebd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34334-Issue_3061_1nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34334-Issue_3061_1nl.cpp
@@ -1,13 +1,16 @@
 DCOPClient::DCOPClient()
 {
     TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
+        &d->postMessageTimer,
+        TQT_SIGNAL(timeout()),
+        this,
         TQT_SLOT(
             processPostedMessagesInternal()));
     TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
+        &d->eventLoopTimer,
+        TQT_SIGNAL(timeout()),
+        this,
+        TQT_SLOT(
             eventLoopTimeout()));
 }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34335-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34335-Issue_3061_2nl.cpp
index ef73253e..38af2ebd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34335-Issue_3061_2nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34335-Issue_3061_2nl.cpp
@@ -1,13 +1,16 @@
 DCOPClient::DCOPClient()
 {
     TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
+        &d->postMessageTimer,
+        TQT_SIGNAL(timeout()),
+        this,
         TQT_SLOT(
             processPostedMessagesInternal()));
     TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
+        &d->eventLoopTimer,
+        TQT_SIGNAL(timeout()),
+        this,
+        TQT_SLOT(
             eventLoopTimeout()));
 }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34336-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34336-Issue_3061_0nl.cpp
index c228ce46..1d93caa5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34336-Issue_3061_0nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34336-Issue_3061_0nl.cpp
@@ -1,13 +1,16 @@
 DCOPClient::DCOPClient()
 {
     TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
+        &d->postMessageTimer,
+        TQT_SIGNAL(timeout()),
+        this,
         TQT_SLOT(
             processPostedMessagesInternal()));
     TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
+        &d->eventLoopTimer,
+        TQT_SIGNAL(timeout()),
+        this,
+        TQT_SLOT(
             eventLoopTimeout()));
 }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34337-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34337-Issue_3061_1nl.cpp
index c228ce46..1d93caa5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34337-Issue_3061_1nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34337-Issue_3061_1nl.cpp
@@ -1,13 +1,16 @@
 DCOPClient::DCOPClient()
 {
     TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
+        &d->postMessageTimer,
+        TQT_SIGNAL(timeout()),
+        this,
         TQT_SLOT(
             processPostedMessagesInternal()));
     TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
+        &d->eventLoopTimer,
+        TQT_SIGNAL(timeout()),
+        this,
+        TQT_SLOT(
             eventLoopTimeout()));
 }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34338-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34338-Issue_3061_2nl.cpp
index c228ce46..1d93caa5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34338-Issue_3061_2nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34338-Issue_3061_2nl.cpp
@@ -1,13 +1,16 @@
 DCOPClient::DCOPClient()
 {
     TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
+        &d->postMessageTimer,
+        TQT_SIGNAL(timeout()),
+        this,
         TQT_SLOT(
             processPostedMessagesInternal()));
     TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
+        &d->eventLoopTimer,
+        TQT_SIGNAL(timeout()),
+        this,
+        TQT_SLOT(
             eventLoopTimeout()));
 }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34339-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34339-Issue_3061_0nl.cpp
index 7188f0d0..42b6641d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34339-Issue_3061_0nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34339-Issue_3061_0nl.cpp
@@ -1,13 +1,16 @@
 DCOPClient::DCOPClient()
 {
     TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
+        &d->postMessageTimer,
+        TQT_SIGNAL(timeout()),
+        this,
         TQT_SLOT(
             processPostedMessagesInternal()));
     TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
+        &d->eventLoopTimer,
+        TQT_SIGNAL(timeout()),
+        this,
+        TQT_SLOT(
             eventLoopTimeout()));
 }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34340-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34340-Issue_3061_1nl.cpp
index 7188f0d0..42b6641d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34340-Issue_3061_1nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34340-Issue_3061_1nl.cpp
@@ -1,13 +1,16 @@
 DCOPClient::DCOPClient()
 {
     TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
+        &d->postMessageTimer,
+        TQT_SIGNAL(timeout()),
+        this,
         TQT_SLOT(
             processPostedMessagesInternal()));
     TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
+        &d->eventLoopTimer,
+        TQT_SIGNAL(timeout()),
+        this,
+        TQT_SLOT(
             eventLoopTimeout()));
 }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34341-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34341-Issue_3061_2nl.cpp
index 7188f0d0..42b6641d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34341-Issue_3061_2nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34341-Issue_3061_2nl.cpp
@@ -1,13 +1,16 @@
 DCOPClient::DCOPClient()
 {
     TQObject::connect(
-        &d->postMessageTimer, TQT_SIGNAL(
-            timeout()), this,
+        &d->postMessageTimer,
+        TQT_SIGNAL(timeout()),
+        this,
         TQT_SLOT(
             processPostedMessagesInternal()));
     TQObject::connect(
-        &d->eventLoopTimer, TQT_SIGNAL(
-            timeout()), this, TQT_SLOT(
+        &d->eventLoopTimer,
+        TQT_SIGNAL(timeout()),
+        this,
+        TQT_SLOT(
             eventLoopTimeout()));
 }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34350-indent_comma_brace_glob.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34350-indent_comma_brace_glob.cpp
index 0e475aa4..0e475aa4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34350-indent_comma_brace_glob.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34350-indent_comma_brace_glob.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34351-indent_comma_brace_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34351-indent_comma_brace_func.cpp
index 59b5b996..59b5b996 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34351-indent_comma_brace_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34351-indent_comma_brace_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34360-nl_before_struct_struct.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34360-nl_before_struct_struct.cpp
index 032a0dfc..032a0dfc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34360-nl_before_struct_struct.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34360-nl_before_struct_struct.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34361-nl_before_struct_scoped_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34361-nl_before_struct_scoped_enum.cpp
index 02ce38f1..02ce38f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34361-nl_before_struct_scoped_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34361-nl_before_struct_scoped_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34370-asm_block_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34370-asm_block_pp.cpp
index e8fc87a6..e8fc87a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34370-asm_block_pp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34370-asm_block_pp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34500-sp_before_case_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34500-sp_before_case_colon.cpp
index 54507d64..54507d64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34500-sp_before_case_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34500-sp_before_case_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34501-sp_endif_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34501-sp_endif_cmt.cpp
index 9e5b2db8..9e5b2db8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34501-sp_endif_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34501-sp_endif_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34502-sp_enum_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34502-sp_enum_assign.cpp
index 62a271a3..62a271a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34502-sp_enum_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34502-sp_enum_assign.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34503-sp_enum_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34503-sp_enum_assign.cpp
index 2ebab438..2ebab438 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34503-sp_enum_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34503-sp_enum_assign.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34504-issue_574-i.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34504-issue_574-i.cpp
index 3366cc79..3366cc79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34504-issue_574-i.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34504-issue_574-i.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34505-Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34505-Issue_3220.cpp
index fae042d7..fae042d7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34505-Issue_3220.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34505-Issue_3220.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34506-Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34506-Issue_3220.cpp
index ba42b013..ba42b013 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34506-Issue_3220.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34506-Issue_3220.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34507-Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34507-Issue_3220.cpp
index f9f684b8..f9f684b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34507-Issue_3220.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34507-Issue_3220.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34508-Issue_3220.cpp
index ba42b013..ba42b013 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3220.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34508-Issue_3220.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34509-byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34509-byref-2.cpp
index ab1b3a6e..ab1b3a6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34509-byref-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34509-byref-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34510-byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34510-byref-2.cpp
index 0ef61cde..0ef61cde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34510-byref-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34510-byref-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34511-byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34511-byref-2.cpp
index db510335..db510335 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34511-byref-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34511-byref-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34512-byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34512-byref-2.cpp
index 099e3c2b..099e3c2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34512-byref-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34512-byref-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34513-sp_cond_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34513-sp_cond_question.cpp
index 5f5a9e14..5f5a9e14 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34513-sp_cond_question.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34513-sp_cond_question.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34514-sp_cond_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34514-sp_cond_question.cpp
index cec6c827..cec6c827 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34514-sp_cond_question.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34514-sp_cond_question.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34515-sp_cond_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34515-sp_cond_question.cpp
index 39997b4a..39997b4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34515-sp_cond_question.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34515-sp_cond_question.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34516-sp_cond_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34516-sp_cond_question.cpp
index c7d79ab9..c7d79ab9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34516-sp_cond_question.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34516-sp_cond_question.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34517-semi.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34517-semi.cpp
index 6c42948f..6c42948f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34517-semi.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34517-semi.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34518-semi.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34518-semi.cpp
index 7c8a711e..7c8a711e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34518-semi.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34518-semi.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34519-semi.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34519-semi.cpp
index 56af135e..56af135e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34519-semi.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34519-semi.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34520-comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34520-comma.cpp
index e9b0c428..e9b0c428 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34520-comma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34520-comma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34521-comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34521-comma.cpp
index e101145a..e101145a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34521-comma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34521-comma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34522-comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34522-comma.cpp
index bc8ebd4f..bc8ebd4f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34522-comma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34522-comma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34523-gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34523-gcc_case_ellipsis.cpp
index 1b0b4088..1b0b4088 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34523-gcc_case_ellipsis.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34523-gcc_case_ellipsis.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34524-bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34524-bug_1002.cpp
index 713018e4..713018e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34524-bug_1002.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34524-bug_1002.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34525-sp_paren_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34525-sp_paren_brace.cpp
index febfb72d..febfb72d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34525-sp_paren_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34525-sp_paren_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34526-sp_paren_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34526-sp_paren_brace.cpp
index 4ac73f87..4ac73f87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34526-sp_paren_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34526-sp_paren_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34527-sp_paren_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34527-sp_paren_brace.cpp
index aa65f644..aa65f644 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34527-sp_paren_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34527-sp_paren_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34528-cmt_trailing_single_line_c_to_cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34528-cmt_trailing_single_line_c_to_cpp.cpp
index 946409b2..946409b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34528-cmt_trailing_single_line_c_to_cpp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34528-cmt_trailing_single_line_c_to_cpp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34529-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34529-type_brace_init_lst.cpp
index cc79678f..cc79678f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34529-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34529-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34530-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34530-type_brace_init_lst.cpp
index b99238b8..b99238b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34530-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34530-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34531-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34531-type_brace_init_lst.cpp
index cc79678f..cc79678f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34531-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34531-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34532-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34532-type_brace_init_lst.cpp
index 53e74de2..53e74de2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34532-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34532-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34533-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34533-templates.cpp
index 5f3d6f90..5f3d6f90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34533-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34533-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34534-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34534-templates.cpp
index 9e3f463d..9e3f463d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34534-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34534-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34535-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34535-sp_after_angle.cpp
index 18788919..18788919 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34535-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34535-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34536-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34536-sp_after_angle.cpp
index 8764578e..8764578e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34536-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34536-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34540-byref-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34540-byref-4.cpp
index 0fe49c7b..0fe49c7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34540-byref-4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34540-byref-4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34541-byref-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34541-byref-4.cpp
index 779da86b..779da86b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34541-byref-4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34541-byref-4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34542-byref-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34542-byref-4.cpp
index 16a7ba9b..16a7ba9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34542-byref-4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34542-byref-4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34543-byref-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34543-byref-4.cpp
index 6bd2e9be..6bd2e9be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34543-byref-4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34543-byref-4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34550-throws.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34550-throws.cpp
index f4e781fb..f4e781fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34550-throws.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34550-throws.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34551-throws.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34551-throws.cpp
index 2a8c2ef0..2a8c2ef0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34551-throws.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34551-throws.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34552-throws.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34552-throws.cpp
index cca784aa..cca784aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34552-throws.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34552-throws.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34553-throws.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34553-throws.cpp
index f8a4cc04..f8a4cc04 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34553-throws.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34553-throws.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34554-throws.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34554-throws.cpp
index f4e781fb..f4e781fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34554-throws.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34554-throws.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34555-throws.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34555-throws.cpp
index 26028e4d..26028e4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34555-throws.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34555-throws.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34556-throws.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34556-throws.cpp
index 6449e658..6449e658 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34556-throws.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34556-throws.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34557-throws.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34557-throws.cpp
index 26028e4d..26028e4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/34557-throws.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/34557-throws.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/39000-UNI-64325.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/39000-UNI-64325.cpp
index c4005d7c..c4005d7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/39000-UNI-64325.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/39000-UNI-64325.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60001-UNI-2650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60001-UNI-2650.cpp
index b9ced773..b9ced773 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60001-UNI-2650.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60001-UNI-2650.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60002-UNI-16283.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60002-UNI-16283.cpp
index 7f042642..7f042642 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60002-UNI-16283.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60002-UNI-16283.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60003-UNI-1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60003-UNI-1288.cpp
index aece270a..aece270a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60003-UNI-1288.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60003-UNI-1288.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60006-UNI-2049.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60006-UNI-2049.cpp
index 7e47d927..7e47d927 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60006-UNI-2049.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60006-UNI-2049.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60017-UNI-2683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60017-UNI-2683.cpp
index 734e3999..734e3999 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60017-UNI-2683.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60017-UNI-2683.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60022-UNI-18439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60022-UNI-18439.cpp
index 8d467c67..8d467c67 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60022-UNI-18439.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60022-UNI-18439.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60025-UNI-19894.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60025-UNI-19894.cpp
index 2d7e481e..2d7e481e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60025-UNI-19894.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60025-UNI-19894.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60027-UNI-21506.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60027-UNI-21506.cpp
index a8c5f2df..a8c5f2df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60027-UNI-21506.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60027-UNI-21506.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60028-UNI-21509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60028-UNI-21509.cpp
index bde48ee7..bde48ee7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60028-UNI-21509.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60028-UNI-21509.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60029-UNI-21510.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60029-UNI-21510.cpp
index ea406fbe..ea406fbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60029-UNI-21510.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60029-UNI-21510.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60030-UNI-21727.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60030-UNI-21727.cpp
index 991d2631..991d2631 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60030-UNI-21727.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60030-UNI-21727.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60031-UNI-21728.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60031-UNI-21728.cpp
index 658fba68..658fba68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60031-UNI-21728.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60031-UNI-21728.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60032-UNI-21729.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60032-UNI-21729.cpp
index 4b8d1d59..4b8d1d59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60032-UNI-21729.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60032-UNI-21729.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60036-UNI-2680.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60036-UNI-2680.cpp
index b6aa5bd7..b6aa5bd7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60036-UNI-2680.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60036-UNI-2680.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60038-UNI-30088.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60038-UNI-30088.cpp
index 1fd5c1fe..1fd5c1fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60038-UNI-30088.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60038-UNI-30088.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60039-UNI-30628.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60039-UNI-30628.cpp
index ffa60026..ffa60026 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60039-UNI-30628.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60039-UNI-30628.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60042-UNI-18777.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60042-UNI-18777.cpp
index 0f177fdc..0f177fdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60042-UNI-18777.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60042-UNI-18777.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60043-i2033.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60043-i2033.cpp
index fd27cf6d..fd27cf6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60043-i2033.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60043-i2033.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60044-i2116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60044-i2116.cpp
index af664cd9..af664cd9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60044-i2116.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60044-i2116.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60045-align_asterisk_after_type_cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60045-align_asterisk_after_type_cast.cpp
index 364b2a6b..364b2a6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60045-align_asterisk_after_type_cast.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60045-align_asterisk_after_type_cast.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp
index c0c066b8..c0c066b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60047-align_default_after_override.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60047-align_default_after_override.cpp
index 43db090f..43db090f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60047-align_default_after_override.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60047-align_default_after_override.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60048-bug_2322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60048-bug_2322.cpp
index 50454903..50454903 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60048-bug_2322.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60048-bug_2322.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60049-bug_2402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60049-bug_2402.cpp
index e483fdc9..e483fdc9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60049-bug_2402.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60049-bug_2402.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60051-bug_2371.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60051-bug_2371.cpp
index f17cec62..f17cec62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60051-bug_2371.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60051-bug_2371.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60052-bug_2433_1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60052-bug_2433_1.cpp
index d011d5a1..d011d5a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60052-bug_2433_1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60052-bug_2433_1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60053-bug_2433_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60053-bug_2433_2.cpp
index 600efc82..600efc82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60053-bug_2433_2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60053-bug_2433_2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp
index ed92e698..ed92e698 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60055-issue_3116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60055-issue_3116.cpp
index fcc38415..ee1a60e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60055-issue_3116.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60055-issue_3116.cpp
@@ -71,7 +71,7 @@ auto f = []
 };
 
 // Nested lambda within functions
-Func(
+FuncA(
     [] {
         return;
     },
@@ -80,7 +80,7 @@ Func(
     }
 );
 
-Func([] {
+FuncB([] {
         return;
     },
     [] {
@@ -88,7 +88,7 @@ Func([] {
     }
 );
 
-Func([] {
+FuncC([] {
         return;
     },
     [] {
@@ -96,14 +96,14 @@ Func([] {
     }
 )();
 
-Func([] {
+FuncD([] {
         return;
     },
     [] {
         return;
     })();
 
-Func([] {
+FuncE([] {
         return;
     },
     [] {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60056-issue_3116-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60056-issue_3116-2.cpp
index 0ce38756..0ce38756 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60056-issue_3116-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60056-issue_3116-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60057-issue_3116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60057-issue_3116.cpp
index 991c46bd..40bc5b9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60057-issue_3116.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60057-issue_3116.cpp
@@ -71,7 +71,7 @@ auto f = []
          };
 
 // Nested lambda within functions
-Func(
+FuncA(
     [] {
         return;
     },
@@ -80,35 +80,35 @@ Func(
     }
 );
 
-Func([] {
-         return;
-     },
-     [] {
-         return;
-     }
+FuncB([] {
+          return;
+      },
+      [] {
+          return;
+      }
 );
 
-Func([] {
-         return;
-     },
-     [] {
-         return;
-     }
+FuncC([] {
+          return;
+      },
+      [] {
+          return;
+      }
 )();
 
-Func([] {
-         return;
-     },
-     [] {
-         return;
-     })();
-
-Func([] {
-         return;
-     },
-     [] {
-         return;
-     });
+FuncD([] {
+          return;
+      },
+      [] {
+          return;
+      })();
+
+FuncE([] {
+          return;
+      },
+      [] {
+          return;
+      });
 
 A(
     B([] (const std::string &s) -> bool {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60058-issue_3330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60058-issue_3330.cpp
index 37062480..37062480 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60058-issue_3330.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60058-issue_3330.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60059-indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60059-indent_ctor_init.cpp
index f1b32d0e..f1b32d0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60059-indent_ctor_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60059-indent_ctor_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60060-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60060-returns.cpp
index 21013963..21013963 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60060-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60060-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60061-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60061-returns.cpp
index bd199ba8..bd199ba8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60061-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60061-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60062-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60062-returns.cpp
index 1085bd72..1085bd72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60062-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60062-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60063-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60063-returns.cpp
index bd199ba8..bd199ba8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60063-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60063-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60064-issue_3368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60064-issue_3368.cpp
index 2158086c..2158086c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60064-issue_3368.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60064-issue_3368.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60065-issue_3378.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60065-issue_3378.cpp
index 8da9261d..8da9261d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60065-issue_3378.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60065-issue_3378.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60066-Issue_3409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60066-Issue_3409.cpp
index 969275dc..969275dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60066-Issue_3409.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60066-Issue_3409.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60067-Issue_3283.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60067-Issue_3283.cpp
index 9357b3b3..9357b3b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60067-Issue_3283.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60067-Issue_3283.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60068-Issue_3428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60068-Issue_3428.cpp
index bf1dc20b..bf1dc20b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60068-Issue_3428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60068-Issue_3428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60069-Issue_3428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60069-Issue_3428.cpp
index 9b95f451..9b95f451 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60069-Issue_3428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60069-Issue_3428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60070-Issue_3428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60070-Issue_3428.cpp
index fbd35533..fbd35533 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60070-Issue_3428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60070-Issue_3428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60071-Issue_3428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60071-Issue_3428.cpp
index bf1dc20b..bf1dc20b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60071-Issue_3428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60071-Issue_3428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60072-Issue_3428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60072-Issue_3428.cpp
index 9b95f451..9b95f451 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60072-Issue_3428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60072-Issue_3428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60073-Issue_3428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60073-Issue_3428.cpp
index fbd35533..fbd35533 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60073-Issue_3428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60073-Issue_3428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60074-Issue_3284.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60074-Issue_3284.cpp
index cea9091e..cea9091e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60074-Issue_3284.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60074-Issue_3284.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60075-Issue_3294.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60075-Issue_3294.cpp
index 4f0718cc..4f0718cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60075-Issue_3294.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60075-Issue_3294.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60076-indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60076-indent_ctor_init.cpp
index 872961ce..872961ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60076-indent_ctor_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60076-indent_ctor_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60077-indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60077-indent_ctor_init.cpp
index acf8c268..acf8c268 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60077-indent_ctor_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60077-indent_ctor_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60078-Issue_3505.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60078-Issue_3505.cpp
index f3225f96..f3225f96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60078-Issue_3505.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60078-Issue_3505.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60079-Issue_3536.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60079-Issue_3536.cpp
index 83f3e7d6..83f3e7d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60079-Issue_3536.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60079-Issue_3536.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60080-Issue_3538.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60080-Issue_3538.cpp
index bd60ace7..bd60ace7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60080-Issue_3538.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60080-Issue_3538.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60081-Issue_3546.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60081-Issue_3546.cpp
index 40131205..40131205 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60081-Issue_3546.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60081-Issue_3546.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60082-Issue_3552.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60082-Issue_3552.cpp
index 73c2e77e..73c2e77e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60082-Issue_3552.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60082-Issue_3552.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60083-Issue_3570.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60083-Issue_3570.h
index a1a2fb26..a1a2fb26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60083-Issue_3570.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60083-Issue_3570.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60084-Issue_3576.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60084-Issue_3576.h
index 9fceffe8..9fceffe8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60084-Issue_3576.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60084-Issue_3576.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60085-Issue_3576.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60085-Issue_3576.h
index 9fceffe8..9fceffe8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60085-Issue_3576.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60085-Issue_3576.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60086-indent_namespace_inner_only.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60086-indent_namespace_inner_only.h
index 32668ed3..32668ed3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60086-indent_namespace_inner_only.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60086-indent_namespace_inner_only.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60087-Issue_3550.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60087-Issue_3550.cpp
index 91337c46..91337c46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60087-Issue_3550.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60087-Issue_3550.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60088-Issue_3761.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60088-Issue_3761.cpp
index b3f8cbb5..b3f8cbb5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60088-Issue_3761.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60088-Issue_3761.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60089-Issue_3863.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60089-Issue_3863.cpp
index 4163ee8e..4163ee8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60089-Issue_3863.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60089-Issue_3863.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60090-Issue_3863_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60090-Issue_3863_2.cpp
index f91c6547..f91c6547 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60090-Issue_3863_2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60090-Issue_3863_2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60091-Issue_3863_3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60091-Issue_3863_3.cpp
index f2885f39..f2885f39 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cpp/60091-Issue_3863_3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60091-Issue_3863_3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60092-Issue_3865.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60092-Issue_3865.cpp
new file mode 100644
index 00000000..1ec73c5c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60092-Issue_3865.cpp
@@ -0,0 +1,34 @@
+MOCK_METHOD(bool, isThat, (const std::string& name), (override));

+MOCK_METHOD(bool, isThat, (std::string& name), (override));

+MOCK_METHOD(bool, isThat, std::string& name, (override));

+MOCK_METHOD(bool, isThat, const std::string& name, (override));

+MyFunction(const std::string& some_value);

+MOCK_METHOD(void, isThat, (Callback const&), (override));

+

+class MyClass

+{

+constexpr explicit MyClass(MyClass*& a) noexcept;

+};

+

+SomeClass::SomeClass(unsigned& counter, MyOtherType& lock)

+	: thisThing(counter)

+	, thatThing(lock)

+{

+}

+

+template<typename T = unsigned>

+struct TemplatedClass

+{

+	TemplatedClass(T& thing) {

+	}

+};

+

+MyThing* MyClass::my_function()

+{

+	return &_theirThing;

+}

+

+// Shouldn't change

+EXPECT_EQ(static_cast<int>(MyEnumm::Last & MyEnumm::MyValue));

+#define SOME_MACRO(type, sss) if(n & type) { if(!k.doofer()) { k += "| "; } k += sss; }

+#define SOME_OTHER_MACRO(ttt, sss) (&ttt, &sss)

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60093-Issue_3865.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60093-Issue_3865.cpp
new file mode 100644
index 00000000..1ec73c5c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60093-Issue_3865.cpp
@@ -0,0 +1,34 @@
+MOCK_METHOD(bool, isThat, (const std::string& name), (override));

+MOCK_METHOD(bool, isThat, (std::string& name), (override));

+MOCK_METHOD(bool, isThat, std::string& name, (override));

+MOCK_METHOD(bool, isThat, const std::string& name, (override));

+MyFunction(const std::string& some_value);

+MOCK_METHOD(void, isThat, (Callback const&), (override));

+

+class MyClass

+{

+constexpr explicit MyClass(MyClass*& a) noexcept;

+};

+

+SomeClass::SomeClass(unsigned& counter, MyOtherType& lock)

+	: thisThing(counter)

+	, thatThing(lock)

+{

+}

+

+template<typename T = unsigned>

+struct TemplatedClass

+{

+	TemplatedClass(T& thing) {

+	}

+};

+

+MyThing* MyClass::my_function()

+{

+	return &_theirThing;

+}

+

+// Shouldn't change

+EXPECT_EQ(static_cast<int>(MyEnumm::Last & MyEnumm::MyValue));

+#define SOME_MACRO(type, sss) if(n & type) { if(!k.doofer()) { k += "| "; } k += sss; }

+#define SOME_OTHER_MACRO(ttt, sss) (&ttt, &sss)

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60100-sp_qualifier_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60100-sp_qualifier_ptr_star.cpp
new file mode 100644
index 00000000..5330b43a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60100-sp_qualifier_ptr_star.cpp
@@ -0,0 +1,8 @@
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char* const*foo3(char* const*);
+char* const  *foo4(char* const  *);
+
+auto foo5() -> char* const*;
+auto foo6() -> char* const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60101-sp_qualifier_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60101-sp_qualifier_ptr_star.cpp
new file mode 100644
index 00000000..39223843
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60101-sp_qualifier_ptr_star.cpp
@@ -0,0 +1,8 @@
+char* const*foo1 = (char* const *)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char* const*foo3(char* const *);
+char* const  *foo4(char* const  *);
+
+auto foo5() -> char* const*;
+auto foo6() -> char* const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60102-sp_qualifier_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60102-sp_qualifier_ptr_star.cpp
new file mode 100644
index 00000000..be8b4f77
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60102-sp_qualifier_ptr_star.cpp
@@ -0,0 +1,8 @@
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const*)"foo";
+
+char* const*foo3(char* const*);
+char* const  *foo4(char* const*);
+
+auto foo5() -> char* const*;
+auto foo6() -> char* const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60103-sp_qualifier_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60103-sp_qualifier_ptr_star.cpp
new file mode 100644
index 00000000..1132b074
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60103-sp_qualifier_ptr_star.cpp
@@ -0,0 +1,8 @@
+char* const*foo1 = (char* const *)"foo";
+char* const  *foo2 = (char* const *)"foo";
+
+char* const*foo3(char* const *);
+char* const  *foo4(char* const *);
+
+auto foo5() -> char* const*;
+auto foo6() -> char* const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60104-sp_qualifier_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60104-sp_qualifier_ptr_star.cpp
new file mode 100644
index 00000000..5330b43a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60104-sp_qualifier_ptr_star.cpp
@@ -0,0 +1,8 @@
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char* const*foo3(char* const*);
+char* const  *foo4(char* const  *);
+
+auto foo5() -> char* const*;
+auto foo6() -> char* const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60105-sp_qualifier_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60105-sp_qualifier_ptr_star.cpp
new file mode 100644
index 00000000..102dfb97
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60105-sp_qualifier_ptr_star.cpp
@@ -0,0 +1,8 @@
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char* const *foo3(char* const*);
+char* const  *foo4(char* const  *);
+
+auto foo5() -> char* const*;
+auto foo6() -> char* const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60106-sp_qualifier_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60106-sp_qualifier_ptr_star.cpp
new file mode 100644
index 00000000..1a3b5910
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60106-sp_qualifier_ptr_star.cpp
@@ -0,0 +1,8 @@
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char* const*foo3(char* const*);
+char* const*foo4(char* const  *);
+
+auto foo5() -> char* const*;
+auto foo6() -> char* const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60107-sp_qualifier_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60107-sp_qualifier_ptr_star.cpp
new file mode 100644
index 00000000..62343950
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60107-sp_qualifier_ptr_star.cpp
@@ -0,0 +1,8 @@
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char* const *foo3(char* const*);
+char* const *foo4(char* const  *);
+
+auto foo5() -> char* const*;
+auto foo6() -> char* const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60108-sp_qualifier_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60108-sp_qualifier_ptr_star.cpp
new file mode 100644
index 00000000..5330b43a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60108-sp_qualifier_ptr_star.cpp
@@ -0,0 +1,8 @@
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char* const*foo3(char* const*);
+char* const  *foo4(char* const  *);
+
+auto foo5() -> char* const*;
+auto foo6() -> char* const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60109-sp_qualifier_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60109-sp_qualifier_ptr_star.cpp
new file mode 100644
index 00000000..2c719ee7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60109-sp_qualifier_ptr_star.cpp
@@ -0,0 +1,8 @@
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char* const*foo3(char* const*);
+char* const  *foo4(char* const  *);
+
+auto foo5() -> char* const *;
+auto foo6() -> char* const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60110-sp_qualifier_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60110-sp_qualifier_ptr_star.cpp
new file mode 100644
index 00000000..42794a2c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60110-sp_qualifier_ptr_star.cpp
@@ -0,0 +1,8 @@
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char* const*foo3(char* const*);
+char* const  *foo4(char* const  *);
+
+auto foo5() -> char* const*;
+auto foo6() -> char* const*;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60111-sp_qualifier_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60111-sp_qualifier_ptr_star.cpp
new file mode 100644
index 00000000..8093bb8d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60111-sp_qualifier_ptr_star.cpp
@@ -0,0 +1,8 @@
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char* const*foo3(char* const*);
+char* const  *foo4(char* const  *);
+
+auto foo5() -> char* const *;
+auto foo6() -> char* const *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60112-sp_before_not_var_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60112-sp_before_not_var_ptr_star.cpp
new file mode 100644
index 00000000..4937f7a0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60112-sp_before_not_var_ptr_star.cpp
@@ -0,0 +1,131 @@
+#include <stdio.h>
+
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char * const*foo3 = (char* const*)"foo";
+char   * const  *foo4 = (char* const  *)"foo";
+char   * const  *foo5 = (char* const  *)"foo";
+char*const*foo6 = (char*const*)"foo";
+
+char* const*foo7(char* const*);
+char* const  *foo8(char* const  *);
+
+int*const *bar0(int);
+char*const*bar1(char* const*);
+char*const  *bar2(char* const  *);
+char  *const  *bar3(char* const  *);
+char *const  *bar4(char* const  *);
+
+void *operator new(int size);
+void*operator new(int size);
+void*    operator new(int size);
+void     *operator new(int size);
+void* operator new(int size);
+
+void *::alloc1(int size);
+void*::alloc2(int size);
+void* ::alloc3(int size);
+void * ::alloc4(int size);
+void     * ::alloc5(int size);
+void     *     ::alloc6(int size);
+
+
+class Test {
+void* method1();
+void *method2();
+void  *method3();
+void*  method4();
+void  *  method5();
+};
+
+void* Test::method1() {
+	return nullptr;
+}
+void *Test::method2() {
+	return NULL;
+}
+void  *Test::method3() {
+	return NULL;
+}
+void*  Test::method4() {
+	return nullptr;
+}
+void  *  Test::method5() {
+	return 0;
+}
+
+
+namespace testing {
+
+int *func1();
+int*func2();
+int *func3();
+int*func4();
+int*func5();
+
+namespace test {
+int *foo();
+}
+
+}
+
+int *testing::func1() {
+	return nullptr;
+}
+int* testing::func2() {
+	return NULL;
+}
+int   *testing::func3() {
+	return nullptr;
+}
+int * testing::func4() {
+	return NULL;
+}
+int  *  testing::func5() {
+	return NULL;
+}
+
+int*testing::test::foo()
+{
+	return NULL;
+}
+
+namespace Bar {
+
+class Foo {
+int*operator[] (int x) {
+}
+
+Foo *get();
+}
+
+}
+
+Bar::Foo*Bar::Foo::get() {
+}
+
+void* not_malloc(const int);
+
+void*::not_malloc(const int n)
+{
+}
+
+int main()
+{
+	void (* name)();
+
+	int *const *x;
+	int *const*x;
+	(int* )x;
+	(const int *const)x;
+	(int const*)x;
+	(int const *)x;
+	int y = 2+*x;
+	return 0;
+}
+
+auto baz1() -> char* const*;
+auto baz2() -> char* const  *;
+auto baz3() -> char * const  *;
+auto baz4() -> char*const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60113-sp_before_not_var_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60113-sp_before_not_var_ptr_star.cpp
new file mode 100644
index 00000000..10681c6f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60113-sp_before_not_var_ptr_star.cpp
@@ -0,0 +1,131 @@
+#include <stdio.h>
+
+char * const*foo1 = (char * const*)"foo";
+char * const  *foo2 = (char * const  *)"foo";
+
+char * const*foo3 = (char * const*)"foo";
+char   * const  *foo4 = (char * const  *)"foo";
+char   * const  *foo5 = (char * const  *)"foo";
+char *const*foo6 = (char *const*)"foo";
+
+char * const*foo7(char * const*);
+char * const  *foo8(char * const  *);
+
+int *const *bar0(int);
+char *const*bar1(char * const*);
+char *const  *bar2(char * const  *);
+char  *const  *bar3(char * const  *);
+char *const  *bar4(char * const  *);
+
+void *operator new(int size);
+void*operator new(int size);
+void*    operator new(int size);
+void     *operator new(int size);
+void* operator new(int size);
+
+void *::alloc1(int size);
+void*::alloc2(int size);
+void* ::alloc3(int size);
+void * ::alloc4(int size);
+void     * ::alloc5(int size);
+void     *     ::alloc6(int size);
+
+
+class Test {
+void* method1();
+void *method2();
+void  *method3();
+void*  method4();
+void  *  method5();
+};
+
+void* Test::method1() {
+	return nullptr;
+}
+void *Test::method2() {
+	return NULL;
+}
+void  *Test::method3() {
+	return NULL;
+}
+void*  Test::method4() {
+	return nullptr;
+}
+void  *  Test::method5() {
+	return 0;
+}
+
+
+namespace testing {
+
+int *func1();
+int*func2();
+int *func3();
+int*func4();
+int*func5();
+
+namespace test {
+int *foo();
+}
+
+}
+
+int *testing::func1() {
+	return nullptr;
+}
+int* testing::func2() {
+	return NULL;
+}
+int   *testing::func3() {
+	return nullptr;
+}
+int * testing::func4() {
+	return NULL;
+}
+int  *  testing::func5() {
+	return NULL;
+}
+
+int*testing::test::foo()
+{
+	return NULL;
+}
+
+namespace Bar {
+
+class Foo {
+int*operator[] (int x) {
+}
+
+Foo *get();
+}
+
+}
+
+Bar::Foo*Bar::Foo::get() {
+}
+
+void* not_malloc(const int);
+
+void*::not_malloc(const int n)
+{
+}
+
+int main()
+{
+	void (* name)();
+
+	int *const *x;
+	int *const*x;
+	(int* )x;
+	(const int *const)x;
+	(int const*)x;
+	(int const *)x;
+	int y = 2+*x;
+	return 0;
+}
+
+auto baz1() -> char* const*;
+auto baz2() -> char* const  *;
+auto baz3() -> char * const  *;
+auto baz4() -> char*const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60114-sp_before_not_var_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60114-sp_before_not_var_ptr_star.cpp
new file mode 100644
index 00000000..34c203d0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60114-sp_before_not_var_ptr_star.cpp
@@ -0,0 +1,131 @@
+#include <stdio.h>
+
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char* const*foo3 = (char* const*)"foo";
+char* const  *foo4 = (char* const  *)"foo";
+char* const  *foo5 = (char* const  *)"foo";
+char*const*foo6 = (char*const*)"foo";
+
+char* const*foo7(char* const*);
+char* const  *foo8(char* const  *);
+
+int*const *bar0(int);
+char*const*bar1(char* const*);
+char*const  *bar2(char* const  *);
+char*const  *bar3(char* const  *);
+char*const  *bar4(char* const  *);
+
+void *operator new(int size);
+void*operator new(int size);
+void*    operator new(int size);
+void     *operator new(int size);
+void* operator new(int size);
+
+void *::alloc1(int size);
+void*::alloc2(int size);
+void* ::alloc3(int size);
+void * ::alloc4(int size);
+void     * ::alloc5(int size);
+void     *     ::alloc6(int size);
+
+
+class Test {
+void* method1();
+void *method2();
+void  *method3();
+void*  method4();
+void  *  method5();
+};
+
+void* Test::method1() {
+	return nullptr;
+}
+void *Test::method2() {
+	return NULL;
+}
+void  *Test::method3() {
+	return NULL;
+}
+void*  Test::method4() {
+	return nullptr;
+}
+void  *  Test::method5() {
+	return 0;
+}
+
+
+namespace testing {
+
+int *func1();
+int*func2();
+int *func3();
+int*func4();
+int*func5();
+
+namespace test {
+int *foo();
+}
+
+}
+
+int *testing::func1() {
+	return nullptr;
+}
+int* testing::func2() {
+	return NULL;
+}
+int   *testing::func3() {
+	return nullptr;
+}
+int * testing::func4() {
+	return NULL;
+}
+int  *  testing::func5() {
+	return NULL;
+}
+
+int*testing::test::foo()
+{
+	return NULL;
+}
+
+namespace Bar {
+
+class Foo {
+int*operator[] (int x) {
+}
+
+Foo *get();
+}
+
+}
+
+Bar::Foo*Bar::Foo::get() {
+}
+
+void* not_malloc(const int);
+
+void*::not_malloc(const int n)
+{
+}
+
+int main()
+{
+	void (* name)();
+
+	int*const *x;
+	int*const*x;
+	(int* )x;
+	(const int*const)x;
+	(int const*)x;
+	(int const *)x;
+	int y = 2+*x;
+	return 0;
+}
+
+auto baz1() -> char* const*;
+auto baz2() -> char* const  *;
+auto baz3() -> char * const  *;
+auto baz4() -> char*const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60115-sp_before_not_var_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60115-sp_before_not_var_ptr_star.cpp
new file mode 100644
index 00000000..ceeea383
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60115-sp_before_not_var_ptr_star.cpp
@@ -0,0 +1,131 @@
+#include <stdio.h>
+
+char * const*foo1 = (char * const*)"foo";
+char * const  *foo2 = (char * const  *)"foo";
+
+char * const*foo3 = (char * const*)"foo";
+char * const  *foo4 = (char * const  *)"foo";
+char * const  *foo5 = (char * const  *)"foo";
+char *const*foo6 = (char *const*)"foo";
+
+char * const*foo7(char * const*);
+char * const  *foo8(char * const  *);
+
+int *const *bar0(int);
+char *const*bar1(char * const*);
+char *const  *bar2(char * const  *);
+char *const  *bar3(char * const  *);
+char *const  *bar4(char * const  *);
+
+void *operator new(int size);
+void*operator new(int size);
+void*    operator new(int size);
+void     *operator new(int size);
+void* operator new(int size);
+
+void *::alloc1(int size);
+void*::alloc2(int size);
+void* ::alloc3(int size);
+void * ::alloc4(int size);
+void     * ::alloc5(int size);
+void     *     ::alloc6(int size);
+
+
+class Test {
+void* method1();
+void *method2();
+void  *method3();
+void*  method4();
+void  *  method5();
+};
+
+void* Test::method1() {
+	return nullptr;
+}
+void *Test::method2() {
+	return NULL;
+}
+void  *Test::method3() {
+	return NULL;
+}
+void*  Test::method4() {
+	return nullptr;
+}
+void  *  Test::method5() {
+	return 0;
+}
+
+
+namespace testing {
+
+int *func1();
+int*func2();
+int *func3();
+int*func4();
+int*func5();
+
+namespace test {
+int *foo();
+}
+
+}
+
+int *testing::func1() {
+	return nullptr;
+}
+int* testing::func2() {
+	return NULL;
+}
+int   *testing::func3() {
+	return nullptr;
+}
+int * testing::func4() {
+	return NULL;
+}
+int  *  testing::func5() {
+	return NULL;
+}
+
+int*testing::test::foo()
+{
+	return NULL;
+}
+
+namespace Bar {
+
+class Foo {
+int*operator[] (int x) {
+}
+
+Foo *get();
+}
+
+}
+
+Bar::Foo*Bar::Foo::get() {
+}
+
+void* not_malloc(const int);
+
+void*::not_malloc(const int n)
+{
+}
+
+int main()
+{
+	void (* name)();
+
+	int *const *x;
+	int *const*x;
+	(int* )x;
+	(const int *const)x;
+	(int const*)x;
+	(int const *)x;
+	int y = 2+*x;
+	return 0;
+}
+
+auto baz1() -> char* const*;
+auto baz2() -> char* const  *;
+auto baz3() -> char * const  *;
+auto baz4() -> char*const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60116-sp_before_not_var_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60116-sp_before_not_var_ptr_star.cpp
new file mode 100644
index 00000000..4937f7a0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60116-sp_before_not_var_ptr_star.cpp
@@ -0,0 +1,131 @@
+#include <stdio.h>
+
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char * const*foo3 = (char* const*)"foo";
+char   * const  *foo4 = (char* const  *)"foo";
+char   * const  *foo5 = (char* const  *)"foo";
+char*const*foo6 = (char*const*)"foo";
+
+char* const*foo7(char* const*);
+char* const  *foo8(char* const  *);
+
+int*const *bar0(int);
+char*const*bar1(char* const*);
+char*const  *bar2(char* const  *);
+char  *const  *bar3(char* const  *);
+char *const  *bar4(char* const  *);
+
+void *operator new(int size);
+void*operator new(int size);
+void*    operator new(int size);
+void     *operator new(int size);
+void* operator new(int size);
+
+void *::alloc1(int size);
+void*::alloc2(int size);
+void* ::alloc3(int size);
+void * ::alloc4(int size);
+void     * ::alloc5(int size);
+void     *     ::alloc6(int size);
+
+
+class Test {
+void* method1();
+void *method2();
+void  *method3();
+void*  method4();
+void  *  method5();
+};
+
+void* Test::method1() {
+	return nullptr;
+}
+void *Test::method2() {
+	return NULL;
+}
+void  *Test::method3() {
+	return NULL;
+}
+void*  Test::method4() {
+	return nullptr;
+}
+void  *  Test::method5() {
+	return 0;
+}
+
+
+namespace testing {
+
+int *func1();
+int*func2();
+int *func3();
+int*func4();
+int*func5();
+
+namespace test {
+int *foo();
+}
+
+}
+
+int *testing::func1() {
+	return nullptr;
+}
+int* testing::func2() {
+	return NULL;
+}
+int   *testing::func3() {
+	return nullptr;
+}
+int * testing::func4() {
+	return NULL;
+}
+int  *  testing::func5() {
+	return NULL;
+}
+
+int*testing::test::foo()
+{
+	return NULL;
+}
+
+namespace Bar {
+
+class Foo {
+int*operator[] (int x) {
+}
+
+Foo *get();
+}
+
+}
+
+Bar::Foo*Bar::Foo::get() {
+}
+
+void* not_malloc(const int);
+
+void*::not_malloc(const int n)
+{
+}
+
+int main()
+{
+	void (* name)();
+
+	int *const *x;
+	int *const*x;
+	(int* )x;
+	(const int *const)x;
+	(int const*)x;
+	(int const *)x;
+	int y = 2+*x;
+	return 0;
+}
+
+auto baz1() -> char* const*;
+auto baz2() -> char* const  *;
+auto baz3() -> char * const  *;
+auto baz4() -> char*const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60117-sp_before_not_var_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60117-sp_before_not_var_ptr_star.cpp
new file mode 100644
index 00000000..006769cc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60117-sp_before_not_var_ptr_star.cpp
@@ -0,0 +1,131 @@
+#include <stdio.h>
+
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char * const*foo3 = (char* const*)"foo";
+char   * const  *foo4 = (char* const  *)"foo";
+char   * const  *foo5 = (char* const  *)"foo";
+char*const*foo6 = (char*const*)"foo";
+
+char* const*foo7(char* const*);
+char* const  *foo8(char* const  *);
+
+int*const *bar0(int);
+char*const*bar1(char* const*);
+char*const  *bar2(char* const  *);
+char  *const  *bar3(char* const  *);
+char *const  *bar4(char* const  *);
+
+void *operator new(int size);
+void *operator new(int size);
+void *    operator new(int size);
+void     *operator new(int size);
+void * operator new(int size);
+
+void *::alloc1(int size);
+void*::alloc2(int size);
+void* ::alloc3(int size);
+void * ::alloc4(int size);
+void     * ::alloc5(int size);
+void     *     ::alloc6(int size);
+
+
+class Test {
+void* method1();
+void *method2();
+void  *method3();
+void*  method4();
+void  *  method5();
+};
+
+void* Test::method1() {
+	return nullptr;
+}
+void *Test::method2() {
+	return NULL;
+}
+void  *Test::method3() {
+	return NULL;
+}
+void*  Test::method4() {
+	return nullptr;
+}
+void  *  Test::method5() {
+	return 0;
+}
+
+
+namespace testing {
+
+int *func1();
+int*func2();
+int *func3();
+int*func4();
+int*func5();
+
+namespace test {
+int *foo();
+}
+
+}
+
+int *testing::func1() {
+	return nullptr;
+}
+int* testing::func2() {
+	return NULL;
+}
+int   *testing::func3() {
+	return nullptr;
+}
+int * testing::func4() {
+	return NULL;
+}
+int  *  testing::func5() {
+	return NULL;
+}
+
+int*testing::test::foo()
+{
+	return NULL;
+}
+
+namespace Bar {
+
+class Foo {
+int *operator[] (int x) {
+}
+
+Foo *get();
+}
+
+}
+
+Bar::Foo*Bar::Foo::get() {
+}
+
+void* not_malloc(const int);
+
+void*::not_malloc(const int n)
+{
+}
+
+int main()
+{
+	void (* name)();
+
+	int *const *x;
+	int *const*x;
+	(int* )x;
+	(const int *const)x;
+	(int const*)x;
+	(int const *)x;
+	int y = 2+*x;
+	return 0;
+}
+
+auto baz1() -> char* const*;
+auto baz2() -> char* const  *;
+auto baz3() -> char * const  *;
+auto baz4() -> char*const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60118-sp_before_not_var_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60118-sp_before_not_var_ptr_star.cpp
new file mode 100644
index 00000000..fefd0694
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60118-sp_before_not_var_ptr_star.cpp
@@ -0,0 +1,131 @@
+#include <stdio.h>
+
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char * const*foo3 = (char* const*)"foo";
+char   * const  *foo4 = (char* const  *)"foo";
+char   * const  *foo5 = (char* const  *)"foo";
+char*const*foo6 = (char*const*)"foo";
+
+char* const*foo7(char* const*);
+char* const  *foo8(char* const  *);
+
+int*const *bar0(int);
+char*const*bar1(char* const*);
+char*const  *bar2(char* const  *);
+char  *const  *bar3(char* const  *);
+char *const  *bar4(char* const  *);
+
+void*operator new(int size);
+void*operator new(int size);
+void*    operator new(int size);
+void*operator new(int size);
+void* operator new(int size);
+
+void *::alloc1(int size);
+void*::alloc2(int size);
+void* ::alloc3(int size);
+void * ::alloc4(int size);
+void     * ::alloc5(int size);
+void     *     ::alloc6(int size);
+
+
+class Test {
+void* method1();
+void *method2();
+void  *method3();
+void*  method4();
+void  *  method5();
+};
+
+void* Test::method1() {
+	return nullptr;
+}
+void *Test::method2() {
+	return NULL;
+}
+void  *Test::method3() {
+	return NULL;
+}
+void*  Test::method4() {
+	return nullptr;
+}
+void  *  Test::method5() {
+	return 0;
+}
+
+
+namespace testing {
+
+int *func1();
+int*func2();
+int *func3();
+int*func4();
+int*func5();
+
+namespace test {
+int *foo();
+}
+
+}
+
+int *testing::func1() {
+	return nullptr;
+}
+int* testing::func2() {
+	return NULL;
+}
+int   *testing::func3() {
+	return nullptr;
+}
+int * testing::func4() {
+	return NULL;
+}
+int  *  testing::func5() {
+	return NULL;
+}
+
+int*testing::test::foo()
+{
+	return NULL;
+}
+
+namespace Bar {
+
+class Foo {
+int*operator[] (int x) {
+}
+
+Foo *get();
+}
+
+}
+
+Bar::Foo*Bar::Foo::get() {
+}
+
+void* not_malloc(const int);
+
+void*::not_malloc(const int n)
+{
+}
+
+int main()
+{
+	void (* name)();
+
+	int *const *x;
+	int *const*x;
+	(int* )x;
+	(const int *const)x;
+	(int const*)x;
+	(int const *)x;
+	int y = 2+*x;
+	return 0;
+}
+
+auto baz1() -> char* const*;
+auto baz2() -> char* const  *;
+auto baz3() -> char * const  *;
+auto baz4() -> char*const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60119-sp_before_not_var_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60119-sp_before_not_var_ptr_star.cpp
new file mode 100644
index 00000000..7168d8a4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60119-sp_before_not_var_ptr_star.cpp
@@ -0,0 +1,131 @@
+#include <stdio.h>
+
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char * const*foo3 = (char* const*)"foo";
+char   * const  *foo4 = (char* const  *)"foo";
+char   * const  *foo5 = (char* const  *)"foo";
+char*const*foo6 = (char*const*)"foo";
+
+char* const*foo7(char* const*);
+char* const  *foo8(char* const  *);
+
+int*const *bar0(int);
+char*const*bar1(char* const*);
+char*const  *bar2(char* const  *);
+char  *const  *bar3(char* const  *);
+char *const  *bar4(char* const  *);
+
+void *operator new(int size);
+void *operator new(int size);
+void *    operator new(int size);
+void *operator new(int size);
+void * operator new(int size);
+
+void *::alloc1(int size);
+void*::alloc2(int size);
+void* ::alloc3(int size);
+void * ::alloc4(int size);
+void     * ::alloc5(int size);
+void     *     ::alloc6(int size);
+
+
+class Test {
+void* method1();
+void *method2();
+void  *method3();
+void*  method4();
+void  *  method5();
+};
+
+void* Test::method1() {
+	return nullptr;
+}
+void *Test::method2() {
+	return NULL;
+}
+void  *Test::method3() {
+	return NULL;
+}
+void*  Test::method4() {
+	return nullptr;
+}
+void  *  Test::method5() {
+	return 0;
+}
+
+
+namespace testing {
+
+int *func1();
+int*func2();
+int *func3();
+int*func4();
+int*func5();
+
+namespace test {
+int *foo();
+}
+
+}
+
+int *testing::func1() {
+	return nullptr;
+}
+int* testing::func2() {
+	return NULL;
+}
+int   *testing::func3() {
+	return nullptr;
+}
+int * testing::func4() {
+	return NULL;
+}
+int  *  testing::func5() {
+	return NULL;
+}
+
+int*testing::test::foo()
+{
+	return NULL;
+}
+
+namespace Bar {
+
+class Foo {
+int *operator[] (int x) {
+}
+
+Foo *get();
+}
+
+}
+
+Bar::Foo*Bar::Foo::get() {
+}
+
+void* not_malloc(const int);
+
+void*::not_malloc(const int n)
+{
+}
+
+int main()
+{
+	void (* name)();
+
+	int *const *x;
+	int *const*x;
+	(int* )x;
+	(const int *const)x;
+	(int const*)x;
+	(int const *)x;
+	int y = 2+*x;
+	return 0;
+}
+
+auto baz1() -> char* const*;
+auto baz2() -> char* const  *;
+auto baz3() -> char * const  *;
+auto baz4() -> char*const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60120-sp_before_not_var_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60120-sp_before_not_var_ptr_star.cpp
new file mode 100644
index 00000000..4937f7a0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60120-sp_before_not_var_ptr_star.cpp
@@ -0,0 +1,131 @@
+#include <stdio.h>
+
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char * const*foo3 = (char* const*)"foo";
+char   * const  *foo4 = (char* const  *)"foo";
+char   * const  *foo5 = (char* const  *)"foo";
+char*const*foo6 = (char*const*)"foo";
+
+char* const*foo7(char* const*);
+char* const  *foo8(char* const  *);
+
+int*const *bar0(int);
+char*const*bar1(char* const*);
+char*const  *bar2(char* const  *);
+char  *const  *bar3(char* const  *);
+char *const  *bar4(char* const  *);
+
+void *operator new(int size);
+void*operator new(int size);
+void*    operator new(int size);
+void     *operator new(int size);
+void* operator new(int size);
+
+void *::alloc1(int size);
+void*::alloc2(int size);
+void* ::alloc3(int size);
+void * ::alloc4(int size);
+void     * ::alloc5(int size);
+void     *     ::alloc6(int size);
+
+
+class Test {
+void* method1();
+void *method2();
+void  *method3();
+void*  method4();
+void  *  method5();
+};
+
+void* Test::method1() {
+	return nullptr;
+}
+void *Test::method2() {
+	return NULL;
+}
+void  *Test::method3() {
+	return NULL;
+}
+void*  Test::method4() {
+	return nullptr;
+}
+void  *  Test::method5() {
+	return 0;
+}
+
+
+namespace testing {
+
+int *func1();
+int*func2();
+int *func3();
+int*func4();
+int*func5();
+
+namespace test {
+int *foo();
+}
+
+}
+
+int *testing::func1() {
+	return nullptr;
+}
+int* testing::func2() {
+	return NULL;
+}
+int   *testing::func3() {
+	return nullptr;
+}
+int * testing::func4() {
+	return NULL;
+}
+int  *  testing::func5() {
+	return NULL;
+}
+
+int*testing::test::foo()
+{
+	return NULL;
+}
+
+namespace Bar {
+
+class Foo {
+int*operator[] (int x) {
+}
+
+Foo *get();
+}
+
+}
+
+Bar::Foo*Bar::Foo::get() {
+}
+
+void* not_malloc(const int);
+
+void*::not_malloc(const int n)
+{
+}
+
+int main()
+{
+	void (* name)();
+
+	int *const *x;
+	int *const*x;
+	(int* )x;
+	(const int *const)x;
+	(int const*)x;
+	(int const *)x;
+	int y = 2+*x;
+	return 0;
+}
+
+auto baz1() -> char* const*;
+auto baz2() -> char* const  *;
+auto baz3() -> char * const  *;
+auto baz4() -> char*const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60121-sp_before_not_var_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60121-sp_before_not_var_ptr_star.cpp
new file mode 100644
index 00000000..a2696a48
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60121-sp_before_not_var_ptr_star.cpp
@@ -0,0 +1,131 @@
+#include <stdio.h>
+
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char * const*foo3 = (char* const*)"foo";
+char   * const  *foo4 = (char* const  *)"foo";
+char   * const  *foo5 = (char* const  *)"foo";
+char*const*foo6 = (char*const*)"foo";
+
+char* const*foo7(char* const*);
+char* const  *foo8(char* const  *);
+
+int*const *bar0(int);
+char*const*bar1(char* const*);
+char*const  *bar2(char* const  *);
+char  *const  *bar3(char* const  *);
+char *const  *bar4(char* const  *);
+
+void *operator new(int size);
+void*operator new(int size);
+void*    operator new(int size);
+void     *operator new(int size);
+void* operator new(int size);
+
+void *::alloc1(int size);
+void*::alloc2(int size);
+void* ::alloc3(int size);
+void * ::alloc4(int size);
+void     * ::alloc5(int size);
+void     *     ::alloc6(int size);
+
+
+class Test {
+void* method1();
+void *method2();
+void  *method3();
+void*  method4();
+void  *  method5();
+};
+
+void * Test::method1() {
+	return nullptr;
+}
+void *Test::method2() {
+	return NULL;
+}
+void  *Test::method3() {
+	return NULL;
+}
+void *  Test::method4() {
+	return nullptr;
+}
+void  *  Test::method5() {
+	return 0;
+}
+
+
+namespace testing {
+
+int *func1();
+int*func2();
+int *func3();
+int*func4();
+int*func5();
+
+namespace test {
+int *foo();
+}
+
+}
+
+int *testing::func1() {
+	return nullptr;
+}
+int * testing::func2() {
+	return NULL;
+}
+int   *testing::func3() {
+	return nullptr;
+}
+int * testing::func4() {
+	return NULL;
+}
+int  *  testing::func5() {
+	return NULL;
+}
+
+int *testing::test::foo()
+{
+	return NULL;
+}
+
+namespace Bar {
+
+class Foo {
+int*operator[] (int x) {
+}
+
+Foo *get();
+}
+
+}
+
+Bar::Foo *Bar::Foo::get() {
+}
+
+void* not_malloc(const int);
+
+void*::not_malloc(const int n)
+{
+}
+
+int main()
+{
+	void (* name)();
+
+	int *const *x;
+	int *const*x;
+	(int* )x;
+	(const int *const)x;
+	(int const*)x;
+	(int const *)x;
+	int y = 2+*x;
+	return 0;
+}
+
+auto baz1() -> char* const*;
+auto baz2() -> char* const  *;
+auto baz3() -> char * const  *;
+auto baz4() -> char*const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60122-sp_before_not_var_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60122-sp_before_not_var_ptr_star.cpp
new file mode 100644
index 00000000..a5a18174
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60122-sp_before_not_var_ptr_star.cpp
@@ -0,0 +1,131 @@
+#include <stdio.h>
+
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char * const*foo3 = (char* const*)"foo";
+char   * const  *foo4 = (char* const  *)"foo";
+char   * const  *foo5 = (char* const  *)"foo";
+char*const*foo6 = (char*const*)"foo";
+
+char* const*foo7(char* const*);
+char* const  *foo8(char* const  *);
+
+int*const *bar0(int);
+char*const*bar1(char* const*);
+char*const  *bar2(char* const  *);
+char  *const  *bar3(char* const  *);
+char *const  *bar4(char* const  *);
+
+void *operator new(int size);
+void*operator new(int size);
+void*    operator new(int size);
+void     *operator new(int size);
+void* operator new(int size);
+
+void *::alloc1(int size);
+void*::alloc2(int size);
+void* ::alloc3(int size);
+void * ::alloc4(int size);
+void     * ::alloc5(int size);
+void     *     ::alloc6(int size);
+
+
+class Test {
+void* method1();
+void *method2();
+void  *method3();
+void*  method4();
+void  *  method5();
+};
+
+void* Test::method1() {
+	return nullptr;
+}
+void*Test::method2() {
+	return NULL;
+}
+void*Test::method3() {
+	return NULL;
+}
+void*  Test::method4() {
+	return nullptr;
+}
+void*  Test::method5() {
+	return 0;
+}
+
+
+namespace testing {
+
+int *func1();
+int*func2();
+int *func3();
+int*func4();
+int*func5();
+
+namespace test {
+int *foo();
+}
+
+}
+
+int*testing::func1() {
+	return nullptr;
+}
+int* testing::func2() {
+	return NULL;
+}
+int*testing::func3() {
+	return nullptr;
+}
+int* testing::func4() {
+	return NULL;
+}
+int*  testing::func5() {
+	return NULL;
+}
+
+int*testing::test::foo()
+{
+	return NULL;
+}
+
+namespace Bar {
+
+class Foo {
+int*operator[] (int x) {
+}
+
+Foo *get();
+}
+
+}
+
+Bar::Foo*Bar::Foo::get() {
+}
+
+void* not_malloc(const int);
+
+void*::not_malloc(const int n)
+{
+}
+
+int main()
+{
+	void (* name)();
+
+	int *const *x;
+	int *const*x;
+	(int* )x;
+	(const int *const)x;
+	(int const*)x;
+	(int const *)x;
+	int y = 2+*x;
+	return 0;
+}
+
+auto baz1() -> char* const*;
+auto baz2() -> char* const  *;
+auto baz3() -> char * const  *;
+auto baz4() -> char*const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60123-sp_before_not_var_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60123-sp_before_not_var_ptr_star.cpp
new file mode 100644
index 00000000..6a8ea64d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60123-sp_before_not_var_ptr_star.cpp
@@ -0,0 +1,131 @@
+#include <stdio.h>
+
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char * const*foo3 = (char* const*)"foo";
+char   * const  *foo4 = (char* const  *)"foo";
+char   * const  *foo5 = (char* const  *)"foo";
+char*const*foo6 = (char*const*)"foo";
+
+char* const*foo7(char* const*);
+char* const  *foo8(char* const  *);
+
+int*const *bar0(int);
+char*const*bar1(char* const*);
+char*const  *bar2(char* const  *);
+char  *const  *bar3(char* const  *);
+char *const  *bar4(char* const  *);
+
+void *operator new(int size);
+void*operator new(int size);
+void*    operator new(int size);
+void     *operator new(int size);
+void* operator new(int size);
+
+void *::alloc1(int size);
+void*::alloc2(int size);
+void* ::alloc3(int size);
+void * ::alloc4(int size);
+void     * ::alloc5(int size);
+void     *     ::alloc6(int size);
+
+
+class Test {
+void* method1();
+void *method2();
+void  *method3();
+void*  method4();
+void  *  method5();
+};
+
+void * Test::method1() {
+	return nullptr;
+}
+void *Test::method2() {
+	return NULL;
+}
+void *Test::method3() {
+	return NULL;
+}
+void *  Test::method4() {
+	return nullptr;
+}
+void *  Test::method5() {
+	return 0;
+}
+
+
+namespace testing {
+
+int *func1();
+int*func2();
+int *func3();
+int*func4();
+int*func5();
+
+namespace test {
+int *foo();
+}
+
+}
+
+int *testing::func1() {
+	return nullptr;
+}
+int * testing::func2() {
+	return NULL;
+}
+int *testing::func3() {
+	return nullptr;
+}
+int * testing::func4() {
+	return NULL;
+}
+int *  testing::func5() {
+	return NULL;
+}
+
+int *testing::test::foo()
+{
+	return NULL;
+}
+
+namespace Bar {
+
+class Foo {
+int*operator[] (int x) {
+}
+
+Foo *get();
+}
+
+}
+
+Bar::Foo *Bar::Foo::get() {
+}
+
+void* not_malloc(const int);
+
+void*::not_malloc(const int n)
+{
+}
+
+int main()
+{
+	void (* name)();
+
+	int *const *x;
+	int *const*x;
+	(int* )x;
+	(const int *const)x;
+	(int const*)x;
+	(int const *)x;
+	int y = 2+*x;
+	return 0;
+}
+
+auto baz1() -> char* const*;
+auto baz2() -> char* const  *;
+auto baz3() -> char * const  *;
+auto baz4() -> char*const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60124-sp_before_not_var_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60124-sp_before_not_var_ptr_star.cpp
new file mode 100644
index 00000000..4937f7a0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60124-sp_before_not_var_ptr_star.cpp
@@ -0,0 +1,131 @@
+#include <stdio.h>
+
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char * const*foo3 = (char* const*)"foo";
+char   * const  *foo4 = (char* const  *)"foo";
+char   * const  *foo5 = (char* const  *)"foo";
+char*const*foo6 = (char*const*)"foo";
+
+char* const*foo7(char* const*);
+char* const  *foo8(char* const  *);
+
+int*const *bar0(int);
+char*const*bar1(char* const*);
+char*const  *bar2(char* const  *);
+char  *const  *bar3(char* const  *);
+char *const  *bar4(char* const  *);
+
+void *operator new(int size);
+void*operator new(int size);
+void*    operator new(int size);
+void     *operator new(int size);
+void* operator new(int size);
+
+void *::alloc1(int size);
+void*::alloc2(int size);
+void* ::alloc3(int size);
+void * ::alloc4(int size);
+void     * ::alloc5(int size);
+void     *     ::alloc6(int size);
+
+
+class Test {
+void* method1();
+void *method2();
+void  *method3();
+void*  method4();
+void  *  method5();
+};
+
+void* Test::method1() {
+	return nullptr;
+}
+void *Test::method2() {
+	return NULL;
+}
+void  *Test::method3() {
+	return NULL;
+}
+void*  Test::method4() {
+	return nullptr;
+}
+void  *  Test::method5() {
+	return 0;
+}
+
+
+namespace testing {
+
+int *func1();
+int*func2();
+int *func3();
+int*func4();
+int*func5();
+
+namespace test {
+int *foo();
+}
+
+}
+
+int *testing::func1() {
+	return nullptr;
+}
+int* testing::func2() {
+	return NULL;
+}
+int   *testing::func3() {
+	return nullptr;
+}
+int * testing::func4() {
+	return NULL;
+}
+int  *  testing::func5() {
+	return NULL;
+}
+
+int*testing::test::foo()
+{
+	return NULL;
+}
+
+namespace Bar {
+
+class Foo {
+int*operator[] (int x) {
+}
+
+Foo *get();
+}
+
+}
+
+Bar::Foo*Bar::Foo::get() {
+}
+
+void* not_malloc(const int);
+
+void*::not_malloc(const int n)
+{
+}
+
+int main()
+{
+	void (* name)();
+
+	int *const *x;
+	int *const*x;
+	(int* )x;
+	(const int *const)x;
+	(int const*)x;
+	(int const *)x;
+	int y = 2+*x;
+	return 0;
+}
+
+auto baz1() -> char* const*;
+auto baz2() -> char* const  *;
+auto baz3() -> char * const  *;
+auto baz4() -> char*const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60125-sp_before_not_var_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60125-sp_before_not_var_ptr_star.cpp
new file mode 100644
index 00000000..06c80b34
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60125-sp_before_not_var_ptr_star.cpp
@@ -0,0 +1,131 @@
+#include <stdio.h>
+
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char * const*foo3 = (char* const*)"foo";
+char   * const  *foo4 = (char* const  *)"foo";
+char   * const  *foo5 = (char* const  *)"foo";
+char*const*foo6 = (char*const*)"foo";
+
+char* const*foo7(char* const*);
+char* const  *foo8(char* const  *);
+
+int*const *bar0(int);
+char*const*bar1(char* const*);
+char*const  *bar2(char* const  *);
+char  *const  *bar3(char* const  *);
+char *const  *bar4(char* const  *);
+
+void *operator new(int size);
+void*operator new(int size);
+void*    operator new(int size);
+void     *operator new(int size);
+void* operator new(int size);
+
+void *::alloc1(int size);
+void *::alloc2(int size);
+void * ::alloc3(int size);
+void * ::alloc4(int size);
+void     * ::alloc5(int size);
+void     *     ::alloc6(int size);
+
+
+class Test {
+void* method1();
+void *method2();
+void  *method3();
+void*  method4();
+void  *  method5();
+};
+
+void* Test::method1() {
+	return nullptr;
+}
+void *Test::method2() {
+	return NULL;
+}
+void  *Test::method3() {
+	return NULL;
+}
+void*  Test::method4() {
+	return nullptr;
+}
+void  *  Test::method5() {
+	return 0;
+}
+
+
+namespace testing {
+
+int *func1();
+int*func2();
+int *func3();
+int*func4();
+int*func5();
+
+namespace test {
+int *foo();
+}
+
+}
+
+int *testing::func1() {
+	return nullptr;
+}
+int* testing::func2() {
+	return NULL;
+}
+int   *testing::func3() {
+	return nullptr;
+}
+int * testing::func4() {
+	return NULL;
+}
+int  *  testing::func5() {
+	return NULL;
+}
+
+int*testing::test::foo()
+{
+	return NULL;
+}
+
+namespace Bar {
+
+class Foo {
+int*operator[] (int x) {
+}
+
+Foo *get();
+}
+
+}
+
+Bar::Foo*Bar::Foo::get() {
+}
+
+void* not_malloc(const int);
+
+void *::not_malloc(const int n)
+{
+}
+
+int main()
+{
+	void (* name)();
+
+	int *const *x;
+	int *const*x;
+	(int* )x;
+	(const int *const)x;
+	(int const*)x;
+	(int const *)x;
+	int y = 2+*x;
+	return 0;
+}
+
+auto baz1() -> char* const*;
+auto baz2() -> char* const  *;
+auto baz3() -> char * const  *;
+auto baz4() -> char*const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60126-sp_before_not_var_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60126-sp_before_not_var_ptr_star.cpp
new file mode 100644
index 00000000..1611a0c8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60126-sp_before_not_var_ptr_star.cpp
@@ -0,0 +1,131 @@
+#include <stdio.h>
+
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char * const*foo3 = (char* const*)"foo";
+char   * const  *foo4 = (char* const  *)"foo";
+char   * const  *foo5 = (char* const  *)"foo";
+char*const*foo6 = (char*const*)"foo";
+
+char* const*foo7(char* const*);
+char* const  *foo8(char* const  *);
+
+int*const *bar0(int);
+char*const*bar1(char* const*);
+char*const  *bar2(char* const  *);
+char  *const  *bar3(char* const  *);
+char *const  *bar4(char* const  *);
+
+void *operator new(int size);
+void*operator new(int size);
+void*    operator new(int size);
+void     *operator new(int size);
+void* operator new(int size);
+
+void*::alloc1(int size);
+void*::alloc2(int size);
+void* ::alloc3(int size);
+void* ::alloc4(int size);
+void* ::alloc5(int size);
+void*     ::alloc6(int size);
+
+
+class Test {
+void* method1();
+void *method2();
+void  *method3();
+void*  method4();
+void  *  method5();
+};
+
+void* Test::method1() {
+	return nullptr;
+}
+void *Test::method2() {
+	return NULL;
+}
+void  *Test::method3() {
+	return NULL;
+}
+void*  Test::method4() {
+	return nullptr;
+}
+void  *  Test::method5() {
+	return 0;
+}
+
+
+namespace testing {
+
+int *func1();
+int*func2();
+int *func3();
+int*func4();
+int*func5();
+
+namespace test {
+int *foo();
+}
+
+}
+
+int *testing::func1() {
+	return nullptr;
+}
+int* testing::func2() {
+	return NULL;
+}
+int   *testing::func3() {
+	return nullptr;
+}
+int * testing::func4() {
+	return NULL;
+}
+int  *  testing::func5() {
+	return NULL;
+}
+
+int*testing::test::foo()
+{
+	return NULL;
+}
+
+namespace Bar {
+
+class Foo {
+int*operator[] (int x) {
+}
+
+Foo *get();
+}
+
+}
+
+Bar::Foo*Bar::Foo::get() {
+}
+
+void* not_malloc(const int);
+
+void*::not_malloc(const int n)
+{
+}
+
+int main()
+{
+	void (* name)();
+
+	int *const *x;
+	int *const*x;
+	(int* )x;
+	(const int *const)x;
+	(int const*)x;
+	(int const *)x;
+	int y = 2+*x;
+	return 0;
+}
+
+auto baz1() -> char* const*;
+auto baz2() -> char* const  *;
+auto baz3() -> char * const  *;
+auto baz4() -> char*const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60127-sp_before_not_var_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60127-sp_before_not_var_ptr_star.cpp
new file mode 100644
index 00000000..ec85d941
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60127-sp_before_not_var_ptr_star.cpp
@@ -0,0 +1,131 @@
+#include <stdio.h>
+
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char * const*foo3 = (char* const*)"foo";
+char   * const  *foo4 = (char* const  *)"foo";
+char   * const  *foo5 = (char* const  *)"foo";
+char*const*foo6 = (char*const*)"foo";
+
+char* const*foo7(char* const*);
+char* const  *foo8(char* const  *);
+
+int*const *bar0(int);
+char*const*bar1(char* const*);
+char*const  *bar2(char* const  *);
+char  *const  *bar3(char* const  *);
+char *const  *bar4(char* const  *);
+
+void *operator new(int size);
+void*operator new(int size);
+void*    operator new(int size);
+void     *operator new(int size);
+void* operator new(int size);
+
+void *::alloc1(int size);
+void *::alloc2(int size);
+void * ::alloc3(int size);
+void * ::alloc4(int size);
+void * ::alloc5(int size);
+void *     ::alloc6(int size);
+
+
+class Test {
+void* method1();
+void *method2();
+void  *method3();
+void*  method4();
+void  *  method5();
+};
+
+void* Test::method1() {
+	return nullptr;
+}
+void *Test::method2() {
+	return NULL;
+}
+void  *Test::method3() {
+	return NULL;
+}
+void*  Test::method4() {
+	return nullptr;
+}
+void  *  Test::method5() {
+	return 0;
+}
+
+
+namespace testing {
+
+int *func1();
+int*func2();
+int *func3();
+int*func4();
+int*func5();
+
+namespace test {
+int *foo();
+}
+
+}
+
+int *testing::func1() {
+	return nullptr;
+}
+int* testing::func2() {
+	return NULL;
+}
+int   *testing::func3() {
+	return nullptr;
+}
+int * testing::func4() {
+	return NULL;
+}
+int  *  testing::func5() {
+	return NULL;
+}
+
+int*testing::test::foo()
+{
+	return NULL;
+}
+
+namespace Bar {
+
+class Foo {
+int*operator[] (int x) {
+}
+
+Foo *get();
+}
+
+}
+
+Bar::Foo*Bar::Foo::get() {
+}
+
+void* not_malloc(const int);
+
+void *::not_malloc(const int n)
+{
+}
+
+int main()
+{
+	void (* name)();
+
+	int *const *x;
+	int *const*x;
+	(int* )x;
+	(const int *const)x;
+	(int const*)x;
+	(int const *)x;
+	int y = 2+*x;
+	return 0;
+}
+
+auto baz1() -> char* const*;
+auto baz2() -> char* const  *;
+auto baz3() -> char * const  *;
+auto baz4() -> char*const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60160-nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60160-nl_func.cpp
new file mode 100644
index 00000000..47d04da5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60160-nl_func.cpp
@@ -0,0 +1,33 @@
+class BSRRE1D_file : PhysicalFile
+{
+	int getFoo() {
+		return(m_foo);
+	}
+
+
+	void setFoo(int foo) {
+		m_foo = foo;
+	}
+
+
+	public BSRRE1D_file() {
+		this.addFormatName("BSRRE1DF");
+	}
+
+
+	private int m_foo;
+	public void xxx() {
+		ahoj();
+	} // comment
+
+
+	public void yyy() {
+		ahoj();
+	}
+
+
+	/* comment 2 */
+	public void xxx() {
+		ahoj();
+	}
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60161-nl_func-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60161-nl_func-2.cpp
new file mode 100644
index 00000000..4da66c79
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60161-nl_func-2.cpp
@@ -0,0 +1,37 @@
+class BSRRE1D_file : PhysicalFile
+{
+	int getFoo() {
+		return(m_foo);
+	}
+
+
+
+
+	void setFoo(int foo) {
+		m_foo = foo;
+	}
+
+
+	public BSRRE1D_file() {
+		this.addFormatName("BSRRE1DF");
+	}
+
+
+	private int m_foo;
+	public void xxx() {
+		ahoj();
+	} // comment
+
+
+
+
+	public void yyy() {
+		ahoj();
+	}
+
+
+	/* comment 2 */
+	public void xxx() {
+		ahoj();
+	}
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60162-nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60162-nl_func.cpp
new file mode 100644
index 00000000..eab99213
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60162-nl_func.cpp
@@ -0,0 +1,23 @@
+class BSRRE1D_file : PhysicalFile
+{
+	int getFoo() {
+		return(m_foo);
+	}
+	void setFoo(int foo) {
+		m_foo = foo;
+	}
+	public BSRRE1D_file() {
+		this.addFormatName("BSRRE1DF");
+	}
+	private int m_foo;
+	public void xxx() {
+		ahoj();
+	} // comment
+	public void yyy() {
+		ahoj();
+	}
+	/* comment 2 */
+	public void xxx() {
+		ahoj();
+	}
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60163-nl_func-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60163-nl_func-2.cpp
new file mode 100644
index 00000000..2e5bbfb6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cpp/60163-nl_func-2.cpp
@@ -0,0 +1,28 @@
+class BSRRE1D_file : PhysicalFile
+{
+	int getFoo() {
+		return(m_foo);
+	}
+
+
+	void setFoo(int foo) {
+		m_foo = foo;
+	}
+	public BSRRE1D_file() {
+		this.addFormatName("BSRRE1DF");
+	}
+	private int m_foo;
+	public void xxx() {
+		ahoj();
+	} // comment
+
+
+	public void yyy() {
+		ahoj();
+	}
+
+	/* comment 2 */
+	public void xxx() {
+		ahoj();
+	}
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10000-simple.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10000-simple.cs
index 36cedfa2..36cedfa2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10000-simple.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10000-simple.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10001-getset.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10001-getset.cs
index 756170b6..756170b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10001-getset.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10001-getset.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10002-simple.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10002-simple.cs
index f8344b26..f8344b26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10002-simple.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10002-simple.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10003-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10003-region.cs
index 2ada63e7..2ada63e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10003-region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10003-region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10010-var-member.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10010-var-member.cs
index 0da0b9f5..0da0b9f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10010-var-member.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10010-var-member.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10011-strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10011-strings.cs
index 6794e762..6794e762 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10011-strings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10011-strings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10012-621_this-spacing.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10012-621_this-spacing.cs
index bd28a5e8..bd28a5e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10012-621_this-spacing.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10012-621_this-spacing.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10013-625_where-constraints.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10013-625_where-constraints.cs
index 123109b0..123109b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10013-625_where-constraints.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10013-625_where-constraints.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10014-630_bad-new-init-semicolon-removal.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10014-630_bad-new-init-semicolon-removal.cs
index 2e6d5a98..2e6d5a98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10014-630_bad-new-init-semicolon-removal.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10014-630_bad-new-init-semicolon-removal.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10015-misc-failures.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10015-misc-failures.cs
index e7022083..e7022083 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10015-misc-failures.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10015-misc-failures.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10016-new-constraint-paren-space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10016-new-constraint-paren-space.cs
index a337a447..a337a447 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10016-new-constraint-paren-space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10016-new-constraint-paren-space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10020-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10020-region.cs
index b2f57ece..b2f57ece 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10020-region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10020-region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10021-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10021-region.cs
index 926e467d..926e467d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10021-region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10021-region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10022-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10022-region.cs
index 9628d4fd..9628d4fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10022-region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10022-region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10023-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10023-region.cs
index e21c467c..e21c467c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10023-region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10023-region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10027-oneline_property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10027-oneline_property.cs
index e4470be2..e4470be2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10027-oneline_property.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10027-oneline_property.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10028-ifcolalign.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10028-ifcolalign.cs
index 13df0440..13df0440 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10028-ifcolalign.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10028-ifcolalign.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10029-when.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10029-when.cs
index 4480f618..4480f618 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10029-when.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10029-when.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10030-sort_using.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10030-sort_using.cs
index 99e802c1..99e802c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10030-sort_using.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10030-sort_using.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10031-bug_i_935.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10031-bug_i_935.cs
index c45eb79d..c45eb79d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10031-bug_i_935.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10031-bug_i_935.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10032-sort_using_categ.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10032-sort_using_categ.cs
index ec997fc9..ec997fc9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10032-sort_using_categ.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10032-sort_using_categ.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10039-615_nested-usings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10039-615_nested-usings.cs
index d46108bd..d46108bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10039-615_nested-usings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10039-615_nested-usings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10040-tcf.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10040-tcf.cs
index 009f269e..009f269e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10040-tcf.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10040-tcf.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10041-gs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10041-gs.cs
index ba9f873e..ba9f873e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10041-gs.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10041-gs.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10042-exception-filters.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10042-exception-filters.cs
index d638d9a8..d638d9a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10042-exception-filters.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10042-exception-filters.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10044-ifcomment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10044-ifcomment.cs
index 2c3ab0fc..2c3ab0fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10044-ifcomment.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10044-ifcomment.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10045-UNI-1288.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10045-UNI-1288.cs
index 03d60f5b..03d60f5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10045-UNI-1288.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10045-UNI-1288.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10050-generics.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10050-generics.cs
index 74e49ecd..74e49ecd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10050-generics.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10050-generics.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10051-UNI-1338.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10051-UNI-1338.cs
index 3f3d9d06..3f3d9d06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10051-UNI-1338.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10051-UNI-1338.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10055-UNI-1345.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10055-UNI-1345.cs
index 13f61127..13f61127 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10055-UNI-1345.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10055-UNI-1345.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10060-unsafe.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10060-unsafe.cs
index fdfdd67b..fdfdd67b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10060-unsafe.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10060-unsafe.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10065-UNI-1975.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10065-UNI-1975.cs
index 1d2f2659..1d2f2659 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10065-UNI-1975.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10065-UNI-1975.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10066-UNI-1977.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10066-UNI-1977.cs
index 94b929c4..94b929c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10066-UNI-1977.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10066-UNI-1977.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10067-UNI-1978.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10067-UNI-1978.cs
index 5f55cb2f..5f55cb2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10067-UNI-1978.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10067-UNI-1978.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10070-utf16le.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10070-utf16le.cs
index c017f6c3..c017f6c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10070-utf16le.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10070-utf16le.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10071-utf16be.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10071-utf16be.cs
index d9f54e37..d9f54e37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10071-utf16be.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10071-utf16be.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10072-utf16le_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10072-utf16le_no_bom.cs
index c017f6c3..c017f6c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10072-utf16le_no_bom.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10072-utf16le_no_bom.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10073-utf16be_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10073-utf16be_no_bom.cs
index d9f54e37..d9f54e37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10073-utf16be_no_bom.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10073-utf16be_no_bom.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10074-UNI-2020.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10074-UNI-2020.cs
index 854a3655..854a3655 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10074-UNI-2020.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10074-UNI-2020.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10075-UNI-2021.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10075-UNI-2021.cs
index b0ec0414..b0ec0414 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10075-UNI-2021.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10075-UNI-2021.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10076-UNI-1343.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10076-UNI-1343.cs
index 076e338d..076e338d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10076-UNI-1343.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10076-UNI-1343.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10077-UNI-1919.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10077-UNI-1919.cs
index cc8e8420..cc8e8420 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10077-UNI-1919.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10077-UNI-1919.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10078-UNI-3484.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10078-UNI-3484.cs
index d7e4f26a..d7e4f26a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10078-UNI-3484.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10078-UNI-3484.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10080-property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10080-property.cs
index 98d3c21c..98d3c21c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10080-property.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10080-property.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10090-string_multi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10090-string_multi.cs
index 7d006dce..7d006dce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10090-string_multi.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10090-string_multi.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10100-bug_600.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10100-bug_600.cs
index 54c24643..54c24643 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10100-bug_600.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10100-bug_600.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10101-sf607.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10101-sf607.cs
index 3207e6c5..3207e6c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10101-sf607.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10101-sf607.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10103-UNI-2506.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10103-UNI-2506.cs
index 8cd07962..8cd07962 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10103-UNI-2506.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10103-UNI-2506.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10104-UNI-2505.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10104-UNI-2505.cs
index a17e6a5e..a17e6a5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10104-UNI-2505.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10104-UNI-2505.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10110-mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10110-mdarray_space.cs
index 8c328f5e..8c328f5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10110-mdarray_space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10110-mdarray_space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10111-mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10111-mdarray_space.cs
index 56aa58ce..56aa58ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10111-mdarray_space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10111-mdarray_space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10112-mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10112-mdarray_space.cs
index ab877b8e..ab877b8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10112-mdarray_space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10112-mdarray_space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10119-preserveTabs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10119-preserveTabs.cs
index c9583dcd..c9583dcd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10119-preserveTabs.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10119-preserveTabs.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10120-cmt_backslash_eol.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10120-cmt_backslash_eol.cs
index e56aec25..e56aec25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10120-cmt_backslash_eol.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10120-cmt_backslash_eol.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10130-sp_between_new_paren.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10130-sp_between_new_paren.cs
index fd706ffa..fd706ffa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10130-sp_between_new_paren.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10130-sp_between_new_paren.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10140-remove_semi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10140-remove_semi.cs
index 3ee1926e..3ee1926e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10140-remove_semi.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10140-remove_semi.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10150-operator-null-conditional.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10150-operator-null-conditional.cs
index 61ac6d74..61ac6d74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10150-operator-null-conditional.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10150-operator-null-conditional.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs
index 416e6afc..416e6afc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10160-delegate.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10160-delegate.cs
index 6296ad80..6296ad80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10160-delegate.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10160-delegate.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10161-delegate.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10161-delegate.cs
index 152fba2b..152fba2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10161-delegate.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10161-delegate.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10200-logger.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10200-logger.cs
index defede8a..defede8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10200-logger.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10200-logger.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10300-1822.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10300-1822.cs
index 92b5fd5b..92b5fd5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10300-1822.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10300-1822.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10628-sf628.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10628-sf628.cs
index 54d3c52c..54d3c52c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/10628-sf628.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/10628-sf628.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/11011-620_getset-brace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/11011-620_getset-brace.cs
index d4652c5f..d4652c5f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/11011-620_getset-brace.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/11011-620_getset-brace.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/11072-UNI-2007.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/11072-UNI-2007.cs
index 29e53f26..29e53f26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/11072-UNI-2007.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/11072-UNI-2007.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/11073-UNI-2008.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/11073-UNI-2008.cs
index a4de3475..a4de3475 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/11073-UNI-2008.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/11073-UNI-2008.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12001-bug_620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12001-bug_620.cs
index 56e9b8bc..56e9b8bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12001-bug_620.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12001-bug_620.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12002-nullable_prop.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12002-nullable_prop.cs
index 21c4f7b0..21c4f7b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12002-nullable_prop.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12002-nullable_prop.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12003-fncall_as_ctor_in_attr.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12003-fncall_as_ctor_in_attr.cs
index 3dab10f6..3dab10f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12003-fncall_as_ctor_in_attr.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12003-fncall_as_ctor_in_attr.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12004-verbatim_strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12004-verbatim_strings.cs
index 73fa1bf0..73fa1bf0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12004-verbatim_strings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12004-verbatim_strings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12005-bug_1591.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12005-bug_1591.cs
index ac62df9e..ac62df9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12005-bug_1591.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12005-bug_1591.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12101-bug_i_679.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12101-bug_i_679.cs
index 199ad7e6..199ad7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12101-bug_i_679.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12101-bug_i_679.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12102-mod_full_brace_nl_block_rem_mlcond.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12102-mod_full_brace_nl_block_rem_mlcond.cs
index e6e0eede..e6e0eede 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12102-mod_full_brace_nl_block_rem_mlcond.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12102-mod_full_brace_nl_block_rem_mlcond.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12103-mod_full_brace_nl_block_rem_mlcond.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12103-mod_full_brace_nl_block_rem_mlcond.cs
index 8ecd4051..8ecd4051 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12103-mod_full_brace_nl_block_rem_mlcond.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12103-mod_full_brace_nl_block_rem_mlcond.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12104-bug_1637.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12104-bug_1637.cs
index 9ffe19e7..9ffe19e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12104-bug_1637.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12104-bug_1637.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12105-bug_1650.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12105-bug_1650.cs
index 869a9d0f..869a9d0f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12105-bug_1650.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12105-bug_1650.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12106-UNI-40685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12106-UNI-40685.cs
index 9b70920e..9b70920e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12106-UNI-40685.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12106-UNI-40685.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12107-mod_full_paren_if_bool.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12107-mod_full_paren_if_bool.cs
index 6bcd9201..6bcd9201 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12107-mod_full_paren_if_bool.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12107-mod_full_paren_if_bool.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12108-Issue_2705.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12108-Issue_2705.cs
index 08619bb1..08619bb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12108-Issue_2705.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12108-Issue_2705.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12200-comma.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12200-comma.cs
index 34ccfdd8..34ccfdd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12200-comma.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12200-comma.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12201-comma.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12201-comma.cs
index 794410f0..794410f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12201-comma.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12201-comma.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12202-comma.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12202-comma.cs
index 29ab2c3e..29ab2c3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/12202-comma.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/12202-comma.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/19000-UNI-58354.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/19000-UNI-58354.cs
index 6c77de40..6c77de40 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/19000-UNI-58354.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/19000-UNI-58354.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/20010-UNI-32658.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/20010-UNI-32658.cs
index 145da65f..145da65f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/20010-UNI-32658.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/20010-UNI-32658.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/20011-bug_1620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/20011-bug_1620.cs
index 3b837292..3b837292 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/20011-bug_1620.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/20011-bug_1620.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60004-UNI-2684.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60004-UNI-2684.cs
index ff0b31f1..ff0b31f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60004-UNI-2684.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60004-UNI-2684.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60005-UNI-2685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60005-UNI-2685.cs
index ec671dd4..ec671dd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60005-UNI-2685.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60005-UNI-2685.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60007-UNI-3083.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60007-UNI-3083.cs
index 5209dc72..5209dc72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60007-UNI-3083.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60007-UNI-3083.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60008-UNI-17253.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60008-UNI-17253.cs
index 9021a372..9021a372 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60008-UNI-17253.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60008-UNI-17253.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60009-UNI-9917.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60009-UNI-9917.cs
index 5e352d10..5e352d10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60009-UNI-9917.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60009-UNI-9917.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60012-UNI-12303.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60012-UNI-12303.cs
index 01be8291..01be8291 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60012-UNI-12303.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60012-UNI-12303.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60013-UNI-13955.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60013-UNI-13955.cs
index 940aa89b..940aa89b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60013-UNI-13955.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60013-UNI-13955.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60015-UNI-14131.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60015-UNI-14131.cs
index 9656bee8..9656bee8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60015-UNI-14131.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60015-UNI-14131.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60016-UNI-11662.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60016-UNI-11662.cs
index 9a49fdba..9a49fdba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60016-UNI-11662.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60016-UNI-11662.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60018-UNI-18777.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60018-UNI-18777.cs
index 198d5be3..198d5be3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60018-UNI-18777.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60018-UNI-18777.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60019-UNI-18780.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60019-UNI-18780.cs
index 0eea713e..0eea713e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60019-UNI-18780.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60019-UNI-18780.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60020-UNI-18829.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60020-UNI-18829.cs
index a72ca87b..a72ca87b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60020-UNI-18829.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60020-UNI-18829.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60023-UNI-18437.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60023-UNI-18437.cs
index d8178e73..d8178e73 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60023-UNI-18437.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60023-UNI-18437.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60024-UNI-19644.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60024-UNI-19644.cs
index eb0d4c9c..eb0d4c9c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60024-UNI-19644.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60024-UNI-19644.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60026-UNI-19895.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60026-UNI-19895.cs
index 1fedd580..1fedd580 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60026-UNI-19895.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60026-UNI-19895.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60033-UNI-21730.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60033-UNI-21730.cs
index 6fcb8c16..6fcb8c16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60033-UNI-21730.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60033-UNI-21730.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60036-UNI-11993.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60036-UNI-11993.cs
index bf703537..bf703537 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60036-UNI-11993.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60036-UNI-11993.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60037-UNI-29933.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60037-UNI-29933.cs
index 943cbf35..943cbf35 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60037-UNI-29933.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60037-UNI-29933.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60040-UNI-30498_2.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60040-UNI-30498_2.cs
index 445a7c97..445a7c97 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60040-UNI-30498_2.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60040-UNI-30498_2.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs
index 2fc371c3..2fc371c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs
index 4f66d541..4f66d541 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60044-UNI-37241.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60044-UNI-37241.cs
index 57d4ffeb..57d4ffeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60044-UNI-37241.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60044-UNI-37241.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60045-add-nl-before-namespace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60045-add-nl-before-namespace.cs
index d9840704..d9840704 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60045-add-nl-before-namespace.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60045-add-nl-before-namespace.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60046-cast.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60046-cast.cs
index 6c5d11db..6c5d11db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/cs/60046-cast.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/cs/60046-cast.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40000-HashMap.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40000-HashMap.d
index e90087c4..e90087c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40000-HashMap.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40000-HashMap.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40001-imports.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40001-imports.d
index 9f12a88e..9f12a88e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40001-imports.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40001-imports.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40002-volatile.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40002-volatile.d
index 73cdf4ac..73cdf4ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40002-volatile.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40002-volatile.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40003-volatile-1.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40003-volatile-1.d
index 2ef2634d..2ef2634d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40003-volatile-1.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40003-volatile-1.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40004-volatile-2.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40004-volatile-2.d
index bc5a0de4..bc5a0de4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40004-volatile-2.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40004-volatile-2.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40005-volatile-3.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40005-volatile-3.d
index 039f788a..039f788a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40005-volatile-3.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40005-volatile-3.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40006-Lexer.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40006-Lexer.d
index 9b2bf8e5..9b2bf8e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40006-Lexer.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40006-Lexer.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40007-Lexer.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40007-Lexer.d
index d8ddf4dc..d8ddf4dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40007-Lexer.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40007-Lexer.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40010-template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40010-template.d
index eaad2b5d..eaad2b5d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40010-template.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40010-template.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40011-template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40011-template.d
index 5c106063..5c106063 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40011-template.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40011-template.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40012-template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40012-template.d
index dbe1fb85..dbe1fb85 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40012-template.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40012-template.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40013-template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40013-template.d
index ec69b8bf..ec69b8bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40013-template.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40013-template.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40020-funcfunc.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40020-funcfunc.d
index de673e78..de673e78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40020-funcfunc.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40020-funcfunc.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40021-tst01.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40021-tst01.d
index a2f63fc0..a2f63fc0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40021-tst01.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40021-tst01.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40022-tst02.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40022-tst02.d
index aa138a86..aa138a86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40022-tst02.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40022-tst02.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40023-bug-indent.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40023-bug-indent.d
index 6071604d..6071604d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40023-bug-indent.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40023-bug-indent.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40024-tst03.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40024-tst03.d
index 2344510d..2344510d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40024-tst03.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40024-tst03.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40025-tst03.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40025-tst03.d
index 15811ebc..15811ebc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40025-tst03.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40025-tst03.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40026-wysiwyg_strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40026-wysiwyg_strings.d
index cfdec32a..cfdec32a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40026-wysiwyg_strings.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40026-wysiwyg_strings.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40027-static_if_in_struct.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40027-static_if_in_struct.d
index be936335..be936335 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40027-static_if_in_struct.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40027-static_if_in_struct.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40030-delegate.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40030-delegate.d
index 5f7beceb..5f7beceb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40030-delegate.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40030-delegate.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40035-enum.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40035-enum.d
index 24d0ef63..24d0ef63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40035-enum.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40035-enum.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40040-sort_import.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40040-sort_import.d
index db26c1e4..db26c1e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40040-sort_import.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40040-sort_import.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40050-strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40050-strings.d
index 4964ad7a..4964ad7a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40050-strings.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40050-strings.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40051-numbers.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40051-numbers.d
index e6527d1b..e6527d1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40051-numbers.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40051-numbers.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40052-numbers.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40052-numbers.d
index 6f474984..6f474984 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40052-numbers.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40052-numbers.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40060-casts.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40060-casts.d
index b1d6b50b..b1d6b50b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40060-casts.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40060-casts.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40061-const.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40061-const.d
index 8277f0c1..8277f0c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40061-const.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40061-const.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40070-d_sp_paren.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40070-d_sp_paren.d
index cc38daae..cc38daae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40070-d_sp_paren.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40070-d_sp_paren.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40080-static_if.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40080-static_if.d
index 0eb3a1a8..0eb3a1a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40080-static_if.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40080-static_if.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40090-square_indent_tab.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40090-square_indent_tab.d
index e9657860..e9657860 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40090-square_indent_tab.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40090-square_indent_tab.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40100-1438.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40100-1438.d
index 66c47d3a..66c47d3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40100-1438.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40100-1438.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40201-invariant.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40201-invariant.d
index 3da6240f..3da6240f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40201-invariant.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40201-invariant.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40300-extern_.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40300-extern_.d
index 40131d6d..40131d6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40300-extern_.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40300-extern_.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40400-vbraces000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40400-vbraces000.d
index 616bb259..616bb259 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40400-vbraces000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40400-vbraces000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40401-vbraces001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40401-vbraces001.d
index 6d7e96f6..6d7e96f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40401-vbraces001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40401-vbraces001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40402-vbraces002.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40402-vbraces002.d
index c966d140..c966d140 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40402-vbraces002.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40402-vbraces002.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40403-template_use.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40403-template_use.d
index 94cdbf6b..94cdbf6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40403-template_use.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40403-template_use.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40500-template_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40500-template_spacing000.d
index 627ca266..627ca266 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40500-template_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40500-template_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40501-template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40501-template_spacing001.d
index dc3242ff..dc3242ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40501-template_spacing001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40501-template_spacing001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40502-template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40502-template_spacing001.d
index 3c238a1f..3c238a1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40502-template_spacing001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40502-template_spacing001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40503-template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40503-template_spacing001.d
index 010cbe07..010cbe07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40503-template_spacing001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40503-template_spacing001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40504-type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40504-type_spacing000.d
index 1e47f131..1e47f131 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40504-type_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40504-type_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40505-type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40505-type_spacing000.d
index 1e47f131..1e47f131 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40505-type_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40505-type_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40506-type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40506-type_spacing000.d
index e11e545b..e11e545b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/d/40506-type_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/d/40506-type_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/ecma/90000-example-1.es b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/ecma/90000-example-1.es
index 45f9b6cb..45f9b6cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/ecma/90000-example-1.es
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/ecma/90000-example-1.es
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80000-assert.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80000-assert.java
index fbc20ba7..fbc20ba7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80000-assert.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80000-assert.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80010-annotation1.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80010-annotation1.java
index 314a0b91..314a0b91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80010-annotation1.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80010-annotation1.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80011-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80011-annotation2.java
index 1acc459f..1acc459f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80011-annotation2.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80011-annotation2.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80012-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80012-annotation2.java
index 1acc459f..1acc459f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80012-annotation2.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80012-annotation2.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80013-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80013-annotation2.java
index 42f5a1df..42f5a1df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80013-annotation2.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80013-annotation2.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80014-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80014-annotation2.java
index 42f5a1df..42f5a1df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80014-annotation2.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80014-annotation2.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80020-foreach.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80020-foreach.java
index 69967517..69967517 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80020-foreach.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80020-foreach.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80030-variable_aligns.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80030-variable_aligns.java
index c73b62d3..c73b62d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80030-variable_aligns.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80030-variable_aligns.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80040-try.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80040-try.java
index 78a55849..78a55849 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80040-try.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80040-try.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80050-double_brace.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80050-double_brace.java
index e00246e1..e00246e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80050-double_brace.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80050-double_brace.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80051-double_brace.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80051-double_brace.java
index 66183ada..66183ada 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80051-double_brace.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80051-double_brace.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80060-synchronized.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80060-synchronized.java
index b8b70a6b..b8b70a6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80060-synchronized.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80060-synchronized.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80061-synchronized.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80061-synchronized.java
index 73fc9b1d..73fc9b1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80061-synchronized.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80061-synchronized.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80062-sp_this_paren.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80062-sp_this_paren.java
index 1c189223..1c189223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80062-sp_this_paren.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80062-sp_this_paren.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80063-i1121.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80063-i1121.java
index 18567ec3..18567ec3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80063-i1121.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80063-i1121.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80064-long_cl_cmt.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80064-long_cl_cmt.java
index af7a1c7e..af7a1c7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80064-long_cl_cmt.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80064-long_cl_cmt.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80065-Java8DoubleColon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80065-Java8DoubleColon.java
index ec594909..ec594909 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80065-Java8DoubleColon.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80065-Java8DoubleColon.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80066-sp_after_for_colon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80066-sp_after_for_colon.java
index 38515aed..38515aed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80066-sp_after_for_colon.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80066-sp_after_for_colon.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80067-doxy-javadoc-alignment.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80067-doxy-javadoc-alignment.java
index 6b9f748b..6b9f748b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80067-doxy-javadoc-alignment.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80067-doxy-javadoc-alignment.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80068-nl_before_ignore_after_case.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80068-nl_before_ignore_after_case.java
index 50bfc274..50bfc274 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80068-nl_before_ignore_after_case.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80068-nl_before_ignore_after_case.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80100-sf567.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80100-sf567.java
index 9fc644b8..9fc644b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80100-sf567.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80100-sf567.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80200-sp_before_byref.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80200-sp_before_byref.java
index 7927ee89..7927ee89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80200-sp_before_byref.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80200-sp_before_byref.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80201-generics.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80201-generics.java
index 086786c0..086786c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80201-generics.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80201-generics.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80202-generics_wildcard.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80202-generics_wildcard.java
index 358e333b..358e333b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80202-generics_wildcard.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80202-generics_wildcard.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80203-generics_return_type.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80203-generics_return_type.java
index 1f2aa340..1f2aa340 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80203-generics_return_type.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80203-generics_return_type.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80204-cast.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80204-cast.java
index 30d0dcc4..30d0dcc4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80204-cast.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80204-cast.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80205-sp_after_angle.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80205-sp_after_angle.java
index bd654485..bd654485 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80205-sp_after_angle.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80205-sp_after_angle.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80206-annotation3.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80206-annotation3.java
index 3d84c04c..3d84c04c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80206-annotation3.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80206-annotation3.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80300-Issue_670.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80300-Issue_670.java
index b0aa2cf0..b0aa2cf0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80300-Issue_670.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80300-Issue_670.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80301-issue_672.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80301-issue_672.java
index 16a077a4..16a077a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80301-issue_672.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80301-issue_672.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80302-Issue_1845.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80302-Issue_1845.java
index 062c89d1..062c89d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80302-Issue_1845.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80302-Issue_1845.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80303-Issue_1122.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80303-Issue_1122.java
index 111ee739..111ee739 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80303-Issue_1122.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80303-Issue_1122.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80304-Issue_1124.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80304-Issue_1124.java
index bca3cb33..bca3cb33 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80304-Issue_1124.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80304-Issue_1124.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80305-Issue_1124.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80305-Issue_1124.java
index 0469fed1..0469fed1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80305-Issue_1124.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80305-Issue_1124.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80306-leading-tabs-for-java-lambda.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80306-leading-tabs-for-java-lambda.java
index 19b6df0f..19b6df0f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/java/80306-leading-tabs-for-java-lambda.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/java/80306-leading-tabs-for-java-lambda.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10018-delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10018-delete-space-oc.mm
index 8760241b..8760241b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10018-delete-space-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10018-delete-space-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10019-func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10019-func-param-wrap-oc.mm
index 45601228..45601228 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10019-func-param-wrap-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10019-func-param-wrap-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10020-align-objc-like-xcode.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10020-align-objc-like-xcode.m
index 93066246..93066246 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10020-align-objc-like-xcode.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10020-align-objc-like-xcode.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10021-double-indent-objc-dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10021-double-indent-objc-dict.m
index a93bd81e..a93bd81e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10021-double-indent-objc-dict.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10021-double-indent-objc-dict.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10022-indent-objc-block.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10022-indent-objc-block.m
index 4aab0fc0..1a97aa27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10022-indent-objc-block.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10022-indent-objc-block.m
@@ -17,7 +17,7 @@ methodCall2( ^ {
 
 [array block:^ (id obj, NSUInteger idx, BOOL *stop) {
          NSLog(@"Object at index %lu is %@", idx, obj);
-       }];
+}];
 
 
 [UIView animateWithDuration:3.0f animation:^{
@@ -75,7 +75,7 @@ methodCall8(x,  ^(Component *c) {
 
 [Object callMethod:xArg block:^(NSString *)(Component *c) {
                           return @"methodCall6";
-                        }];
+}];
 
 
 [Object callMethod:xArg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10033-objc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10033-objc.mm
index 07ede276..07ede276 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10033-objc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10033-objc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10034-asm.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10034-asm.h.mm
index 84a5efa8..84a5efa8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10034-asm.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10034-asm.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10035-definesalign.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10035-definesalign.h.mm
index 9ad29954..9ad29954 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10035-definesalign.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10035-definesalign.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10036-inttypes.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10036-inttypes.h.mm
index 4ac13417..4ac13417 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10036-inttypes.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10036-inttypes.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10046-UNI-1333.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10046-UNI-1333.mm
index 5c91693c..5c91693c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10046-UNI-1333.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10046-UNI-1333.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10102-pp-ignore.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10102-pp-ignore.mm
index f26232c9..f26232c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/10102-pp-ignore.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/10102-pp-ignore.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/11030-argtypes.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/11030-argtypes.mm
index 1afeb694..1afeb694 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/11030-argtypes.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/11030-argtypes.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/11031-casting.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/11031-casting.mm
index c73d6ef8..c73d6ef8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/11031-casting.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/11031-casting.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/11032-newlines.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/11032-newlines.mm
index 45fd64f9..45fd64f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/11032-newlines.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/11032-newlines.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50001-Fraction.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50001-Fraction.h
index b1e373c2..b1e373c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50001-Fraction.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50001-Fraction.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50002-Fraction.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50002-Fraction.m
index 4ad6dfc8..4ad6dfc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50002-Fraction.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50002-Fraction.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50003-main.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50003-main.m
index ec082dc1..ec082dc1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50003-main.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50003-main.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50004-string.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50004-string.m
index bbfeb51e..bbfeb51e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50004-string.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50004-string.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50005-Declarations.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50005-Declarations.h
index 3b65c41c..3b65c41c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50005-Declarations.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50005-Declarations.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50006-exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50006-exceptions.m
index 609d2086..609d2086 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50006-exceptions.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50006-exceptions.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50007-misc.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50007-misc.m
index 4de222a1..4de222a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50007-misc.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50007-misc.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50008-protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50008-protocol.m
index 50c4314a..50c4314a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50008-protocol.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50008-protocol.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50009-literals.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50009-literals.mm
index 4bd99277..4bd99277 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50009-literals.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50009-literals.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50010-return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50010-return_type.m
index 62275a52..62275a52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50010-return_type.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50010-return_type.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50011-return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50011-return_type.m
index 7cc95485..7cc95485 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50011-return_type.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50011-return_type.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50012-return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50012-return_type.m
index 106c5466..106c5466 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50012-return_type.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50012-return_type.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50014-sp_oc_classname_paren-r.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50014-sp_oc_classname_paren-r.m
index 847e9dca..847e9dca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50014-sp_oc_classname_paren-r.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50014-sp_oc_classname_paren-r.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50015-receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50015-receiver.m
index dd6ee3d6..dd6ee3d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50015-receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50015-receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50016-ternary.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50016-ternary.m
index 42a573f4..42a573f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50016-ternary.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50016-ternary.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50017-ternary.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50017-ternary.m
index d53fc319..d53fc319 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50017-ternary.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50017-ternary.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50018-indent-inside-ternary-operator.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50018-indent-inside-ternary-operator.m
index 59412a01..59412a01 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50018-indent-inside-ternary-operator.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50018-indent-inside-ternary-operator.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50020-selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50020-selector.m
index c53db6fb..c53db6fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50020-selector.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50020-selector.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50021-selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50021-selector.m
index 3442f700..3442f700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50021-selector.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50021-selector.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50022-selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50022-selector.m
index 1d790cc9..1d790cc9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50022-selector.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50022-selector.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50025-exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50025-exceptions.m
index 609d2086..609d2086 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50025-exceptions.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50025-exceptions.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50026-exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50026-exceptions.m
index 150de092..150de092 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50026-exceptions.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50026-exceptions.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50030-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50030-sort_import.m
index e0cfcb88..e0cfcb88 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50030-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50030-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50031-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50031-sort_import.m
index e0cfcb88..e0cfcb88 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50031-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50031-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50032-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50032-sort_import.m
index 37b4d643..37b4d643 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50032-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50032-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50033-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50033-sort_import.m
index 7c2ab21f..7c2ab21f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50033-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50033-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50034-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50034-sort_import.m
index f8a42242..f8a42242 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50034-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50034-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50035-sort_import_group.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50035-sort_import_group.m
index 251829df..251829df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50035-sort_import_group.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50035-sort_import_group.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50036-sort_import_group_regex.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50036-sort_import_group_regex.mm
index 633da761..633da761 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50036-sort_import_group_regex.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50036-sort_import_group_regex.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50040-complex_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50040-complex_method.m
index 29467813..29467813 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50040-complex_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50040-complex_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50050-real_world_file.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50050-real_world_file.m
index a4bf639e..a4bf639e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50050-real_world_file.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50050-real_world_file.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50060-oc-split.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50060-oc-split.m
index a7bcd4de..a7bcd4de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50060-oc-split.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50060-oc-split.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50061-bug_167.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50061-bug_167.m
index 28087bb4..28087bb4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50061-bug_167.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50061-bug_167.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50062-issue_2631.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50062-issue_2631.m
index a4404650..a4404650 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50062-issue_2631.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50062-issue_2631.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50070-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50070-blocks.m
index 8b77ccda..8b77ccda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50070-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50070-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50071-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50071-blocks.m
index 8b77ccda..8b77ccda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50071-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50071-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50072-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50072-blocks.m
index 8b77ccda..8b77ccda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50072-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50072-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50073-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50073-blocks.m
index 06a9cd78..06a9cd78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50073-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50073-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50074-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50074-blocks.m
index 467387b4..467387b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50074-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50074-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50075-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50075-blocks.m
index 8b77ccda..8b77ccda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50075-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50075-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50076-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50076-blocks.m
index 8b77ccda..8b77ccda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50076-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50076-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50077-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50077-more_blocks.m
index 75870d32..75870d32 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50077-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50077-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50078-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50078-more_blocks.m
index 91d27d55..91d27d55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50078-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50078-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50079-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50079-more_blocks.m
index f6af5562..f6af5562 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50079-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50079-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50080-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50080-more_blocks.m
index 1fbb7c34..1fbb7c34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50080-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50080-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50081-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50081-more_blocks.m
index 1fbb7c34..1fbb7c34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50081-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50081-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50082-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50082-more_blocks.m
index 75870d32..75870d32 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50082-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50082-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50083-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50083-more_blocks.m
index f6af5562..f6af5562 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50083-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50083-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50084-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50084-more_blocks.m
index 75870d32..75870d32 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50084-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50084-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50085-block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50085-block_in_method.m
index 7a91d13e..7a91d13e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50085-block_in_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50085-block_in_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50086-block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50086-block_in_method.m
index c5c9ae6b..c5c9ae6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50086-block_in_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50086-block_in_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50087-indent_oc_inside_msg_sel.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50087-indent_oc_inside_msg_sel.m
index af5c2b7b..af5c2b7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50087-indent_oc_inside_msg_sel.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50087-indent_oc_inside_msg_sel.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50090-kw.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50090-kw.m
index ef52dd8e..ef52dd8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50090-kw.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50090-kw.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50091-block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50091-block_in_method.m
index 705435d8..705435d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50091-block_in_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50091-block_in_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50095-box.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50095-box.m
index 45b0de1b..45b0de1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50095-box.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50095-box.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50100-bug_340.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50100-bug_340.m
index ec5135ab..ec5135ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50100-bug_340.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50100-bug_340.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50110-msg_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50110-msg_align.m
index 041148c1..041148c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50110-msg_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50110-msg_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50111-ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50111-ns_enum.m
index 1b960272..1b960272 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50111-ns_enum.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50111-ns_enum.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50112-ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50112-ns_enum.m
index 1b960272..1b960272 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50112-ns_enum.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50112-ns_enum.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50113-ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50113-ns_enum.m
index 5c30d740..5c30d740 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50113-ns_enum.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50113-ns_enum.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50120-gh137.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50120-gh137.m
index ff41543a..ff41543a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50120-gh137.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50120-gh137.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50200-more_blocks_2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50200-more_blocks_2.m
index 8835454f..8835454f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50200-more_blocks_2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50200-more_blocks_2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50201-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50201-blocks_align.m
index 505c9b99..505c9b99 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50201-blocks_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50201-blocks_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50202-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50202-blocks_align.m
index 439ac716..439ac716 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50202-blocks_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50202-blocks_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50203-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50203-blocks_align.m
index 07bd3cf3..07bd3cf3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50203-blocks_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50203-blocks_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50204-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50204-blocks_align.m
index a2cefc1f..a2cefc1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50204-blocks_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50204-blocks_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50205-msg_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50205-msg_align.m
index f024b44c..f024b44c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50205-msg_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50205-msg_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50206-issue_2727.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50206-issue_2727.m
index 5639c298..5639c298 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50206-issue_2727.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50206-issue_2727.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50207-issue_3031.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50207-issue_3031.mm
index 75e6f5ea..75e6f5ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50207-issue_3031.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50207-issue_3031.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50300-msg.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50300-msg.m
index 79c1a60a..79c1a60a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50300-msg.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50300-msg.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50400-for.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50400-for.m
index 35c34bce..35c34bce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50400-for.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50400-for.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50410-oc_cond_colon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50410-oc_cond_colon.m
index 8059a3c6..8059a3c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50410-oc_cond_colon.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50410-oc_cond_colon.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50411-attribute_specifier_seqs.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50411-attribute_specifier_seqs.mm
index 49dfaefa..49dfaefa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50411-attribute_specifier_seqs.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50411-attribute_specifier_seqs.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50500-code_placeholder.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50500-code_placeholder.m
index f6a745ed..f6a745ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50500-code_placeholder.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50500-code_placeholder.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50510-gh293.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50510-gh293.m
index a1dffc49..a1dffc49 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50510-gh293.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50510-gh293.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50511-gh293.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50511-gh293.m
index 6e4c180a..6e4c180a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50511-gh293.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50511-gh293.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50512-sp_oc_catch.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50512-sp_oc_catch.m
index 6040b071..6040b071 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50512-sp_oc_catch.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50512-sp_oc_catch.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50513-sp_oc_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50513-sp_oc_boxed.m
index 916e9330..916e9330 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50513-sp_oc_boxed.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50513-sp_oc_boxed.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50514-indent_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50514-indent_boxed.m
index 165ee244..165ee244 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50514-indent_boxed.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50514-indent_boxed.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50515-sp_oc_synchronized.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50515-sp_oc_synchronized.m
index ffff5618..ffff5618 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50515-sp_oc_synchronized.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50515-sp_oc_synchronized.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50600-bug_i_477.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50600-bug_i_477.m
index 0e7cbb78..0e7cbb78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50600-bug_i_477.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50600-bug_i_477.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50601-bug_i_408.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50601-bug_i_408.m
index 700d159d..700d159d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50601-bug_i_408.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50601-bug_i_408.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50602-bug_i_125-412.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50602-bug_i_125-412.m
index 4beec2d5..4beec2d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50602-bug_i_125-412.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50602-bug_i_125-412.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50603-gh511.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50603-gh511.m
index 2c86e32d..2c86e32d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50603-gh511.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50603-gh511.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50604-bug_497.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50604-bug_497.m
index 121503b4..121503b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50604-bug_497.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50604-bug_497.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50605-bug_404.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50605-bug_404.m
index 8244ebd3..8244ebd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50605-bug_404.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50605-bug_404.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50606-bug_1366.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50606-bug_1366.m
index f4058b1f..f4058b1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50606-bug_1366.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50606-bug_1366.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50607-sp_after_oc_msg_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50607-sp_after_oc_msg_receiver.m
index 14eaed36..14eaed36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50607-sp_after_oc_msg_receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50607-sp_after_oc_msg_receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50608-blocks_align2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50608-blocks_align2.m
index b37c1b4b..b37c1b4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50608-blocks_align2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50608-blocks_align2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50609-negative_value.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50609-negative_value.m
index 9aa4dc80..9aa4dc80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50609-negative_value.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50609-negative_value.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50610-nelem.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50610-nelem.m
index d42ce3b6..d42ce3b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50610-nelem.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50610-nelem.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50611-for2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50611-for2.m
index 535bc50b..535bc50b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50611-for2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50611-for2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50612-chunk_ends_type1.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50612-chunk_ends_type1.m
index fb9bb4e1..fb9bb4e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50612-chunk_ends_type1.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50612-chunk_ends_type1.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50613-chunk_ends_type2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50613-chunk_ends_type2.m
index 64efc7e6..64efc7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50613-chunk_ends_type2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50613-chunk_ends_type2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50614-chunk_ends_type3.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50614-chunk_ends_type3.m
index 8f0ae62c..8f0ae62c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50614-chunk_ends_type3.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50614-chunk_ends_type3.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50615-block_literal_protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50615-block_literal_protocol.m
index 35879a0e..35879a0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50615-block_literal_protocol.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50615-block_literal_protocol.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50616-oc_msg_in_pp.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50616-oc_msg_in_pp.m
index 8496973b..8496973b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50616-oc_msg_in_pp.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50616-oc_msg_in_pp.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50617-boxed_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50617-boxed_receiver.m
index e4c247fd..e4c247fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50617-boxed_receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50617-boxed_receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50618-func_def.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50618-func_def.mm
index 49de2fea..49de2fea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50618-func_def.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50618-func_def.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50619-cast.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50619-cast.m
index 1e588579..1e588579 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50619-cast.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50619-cast.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50620-sp_after_angle.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50620-sp_after_angle.m
index 318071ba..318071ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50620-sp_after_angle.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50620-sp_after_angle.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50621-Fraction.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50621-Fraction.h
index 77403abd..77403abd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50621-Fraction.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50621-Fraction.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c
index f17c10ed..f17c10ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50623-extern-c-attribute.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50623-extern-c-attribute.m
index 1c752682..1c752682 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50623-extern-c-attribute.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50623-extern-c-attribute.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50624-typeof.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50624-typeof.m
index 968aad5a..968aad5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50624-typeof.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50624-typeof.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50625-sp_inside_braces_oc_dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50625-sp_inside_braces_oc_dict.m
index f98a27ea..f98a27ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50625-sp_inside_braces_oc_dict.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50625-sp_inside_braces_oc_dict.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50626-chunk_ends_type4.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50626-chunk_ends_type4.m
index dd4d55fe..dd4d55fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50626-chunk_ends_type4.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50626-chunk_ends_type4.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50627-method_ends_semicolon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50627-method_ends_semicolon.m
index b1ca36fa..b1ca36fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50627-method_ends_semicolon.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50627-method_ends_semicolon.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50628-macro-close-brace.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50628-macro-close-brace.m
index 0eb3fa81..0eb3fa81 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50628-macro-close-brace.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50628-macro-close-brace.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50629-pp_bool.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50629-pp_bool.m
index b1bf896c..b1bf896c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50629-pp_bool.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50629-pp_bool.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50630-nl_func_call_args_multi_line_ignore_closures.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50630-nl_func_call_args_multi_line_ignore_closures.m
index 5c07ea43..5c07ea43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50630-nl_func_call_args_multi_line_ignore_closures.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50630-nl_func_call_args_multi_line_ignore_closures.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50631-nl_oc_msg_args_min_params.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50631-nl_oc_msg_args_min_params.m
index 441321d4..441321d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50631-nl_oc_msg_args_min_params.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50631-nl_oc_msg_args_min_params.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50632-nl_oc_msg_args_max_code_width.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50632-nl_oc_msg_args_max_code_width.m
index 0ee1dae1..0ee1dae1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50632-nl_oc_msg_args_max_code_width.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50632-nl_oc_msg_args_max_code_width.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50633-ocpp_msg_access.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50633-ocpp_msg_access.mm
index ee2dbe03..ee2dbe03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50633-ocpp_msg_access.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50633-ocpp_msg_access.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50700-cmt_insert.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50700-cmt_insert.m
index ec94c42b..ec94c42b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50700-cmt_insert.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50700-cmt_insert.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50701-cmt_insert2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50701-cmt_insert2.m
index 7a90cc57..7a90cc57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50701-cmt_insert2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50701-cmt_insert2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50800-properties.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50800-properties.m
index fa9ca930..fa9ca930 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50800-properties.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50800-properties.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50801-i1213.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50801-i1213.m
index f47e5964..f47e5964 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50801-i1213.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50801-i1213.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50802-available.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50802-available.m
index 5054043a..5054043a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50802-available.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50802-available.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50803-indent_single_newline.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50803-indent_single_newline.m
index a70184e5..a70184e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50803-indent_single_newline.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50803-indent_single_newline.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50804-issue_2629.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50804-issue_2629.m
index 6d6cbf30..6d6cbf30 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50804-issue_2629.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50804-issue_2629.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50805-issue_2724.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50805-issue_2724.m
index 23241732..23241732 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50805-issue_2724.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50805-issue_2724.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50810-bug_841.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50810-bug_841.m
index 8e8a6713..8e8a6713 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50810-bug_841.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50810-bug_841.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50811-bug_1674.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50811-bug_1674.m
index 7d23b230..7d23b230 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50811-bug_1674.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50811-bug_1674.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50812-bug_1683.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50812-bug_1683.m
index 3ee562c0..3ee562c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50812-bug_1683.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50812-bug_1683.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50813-sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50813-sp_before_oc_proto_list.m
index 65d13399..65d13399 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50813-sp_before_oc_proto_list.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50813-sp_before_oc_proto_list.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50814-sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50814-sp_before_oc_proto_list.m
index be1f49ed..be1f49ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50814-sp_before_oc_proto_list.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50814-sp_before_oc_proto_list.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50815-sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50815-sp_before_oc_proto_list.m
index 1fef0cc4..1fef0cc4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50815-sp_before_oc_proto_list.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50815-sp_before_oc_proto_list.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50816-issue_2675.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50816-issue_2675.m
index ccb80f6b..ccb80f6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50816-issue_2675.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50816-issue_2675.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50817-issue_2722.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50817-issue_2722.m
index 8919895a..8919895a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50817-issue_2722.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50817-issue_2722.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50900-1927.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50900-1927.m
index 3ae39e47..3ae39e47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50900-1927.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50900-1927.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50901-Issue_2172.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50901-Issue_2172.m
index efa73591..efa73591 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50901-Issue_2172.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50901-Issue_2172.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50902-Issue_2289.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50902-Issue_2289.m
index 19fe5cdf..19fe5cdf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50902-Issue_2289.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50902-Issue_2289.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50903-Issue_681.oc b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50903-Issue_681.oc
index 1e71cdaa..1e71cdaa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50903-Issue_681.oc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50903-Issue_681.oc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50904-double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50904-double_angle_space.m
index 0e6c0c0c..0e6c0c0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50904-double_angle_space.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50904-double_angle_space.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50905-double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50905-double_angle_space.m
index 9636a38e..9636a38e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50905-double_angle_space.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50905-double_angle_space.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50906-double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50906-double_angle_space.m
index 5c16c25f..5c16c25f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50906-double_angle_space.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50906-double_angle_space.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50907-align_colon_with_ternary_1.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50907-align_colon_with_ternary_1.m
index 2b5f1ef8..2b5f1ef8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50907-align_colon_with_ternary_1.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50907-align_colon_with_ternary_1.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50908-align_colon_with_ternary_2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50908-align_colon_with_ternary_2.m
index bfca2a80..bfca2a80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50908-align_colon_with_ternary_2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50908-align_colon_with_ternary_2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50909-3766.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50909-3766.m
index 36b83473..36b83473 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50909-3766.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50909-3766.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50910-3767.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50910-3767.mm
index a7cbb954..a7cbb954 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50910-3767.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50910-3767.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50911-3811.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50911-3811.mm
index 4510b8c2..4510b8c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50911-3811.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50911-3811.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50912-3812.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50912-3812.m
index acea28c0..acea28c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50912-3812.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50912-3812.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50913-3813.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50913-3813.m
index 37e9239f..37e9239f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50913-3813.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50913-3813.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50914-3819.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50914-3819.m
index 2a34b1c3..2a34b1c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50914-3819.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50914-3819.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50915-3822.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50915-3822.h
index e0f113e1..e0f113e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50915-3822.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50915-3822.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50916-3823.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50916-3823.m
index 9c110935..9c110935 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/50916-3823.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/50916-3823.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/51000-sp_cond_ternary_short.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/51000-sp_cond_ternary_short.m
index 6c1ce050..6c1ce050 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/51000-sp_cond_ternary_short.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/51000-sp_cond_ternary_short.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/51001-ns_enum-i.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/51001-ns_enum-i.m
index e5caad06..e5caad06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/51001-ns_enum-i.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/51001-ns_enum-i.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/51002-sp_oc_catch.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/51002-sp_oc_catch.m
index 391b8df8..391b8df8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/51002-sp_oc_catch.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/51002-sp_oc_catch.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/51003-sp_oc_catch.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/51003-sp_oc_catch.m
index c214c848..c214c848 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/51003-sp_oc_catch.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/51003-sp_oc_catch.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/51004-block_pointer.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/51004-block_pointer.m
index ab51e3d2..ab51e3d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/51004-block_pointer.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/51004-block_pointer.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/60011-UNI-11095.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/60011-UNI-11095.mm
index 4f88df51..4f88df51 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/oc/60011-UNI-11095.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/oc/60011-UNI-11095.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60000-functions.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60000-functions.pawn
index 853c70ad..853c70ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60000-functions.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60000-functions.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60001-comment.p b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60001-comment.p
index f63deb62..f63deb62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60001-comment.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60001-comment.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60002-traffic.p b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60002-traffic.p
index a902e497..a902e497 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60002-traffic.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60002-traffic.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60003-tags.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60003-tags.pawn
index b21f7679..b21f7679 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60003-tags.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60003-tags.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60004-enum.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60004-enum.pawn
index 7dd318f3..7dd318f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60004-enum.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60004-enum.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60005-unbraced.p b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60005-unbraced.p
index 1a22a3af..1a22a3af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60005-unbraced.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60005-unbraced.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60010-str-escape.p b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60010-str-escape.p
index 3aa54453..3aa54453 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60010-str-escape.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60010-str-escape.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60020-switch-vsemi.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60020-switch-vsemi.sma
index a0c720f7..a0c720f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60020-switch-vsemi.sma
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60020-switch-vsemi.sma
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60030-crusty_ex-1.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60030-crusty_ex-1.sma
index 23e042dd..23e042dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60030-crusty_ex-1.sma
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60030-crusty_ex-1.sma
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60040-preproc.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60040-preproc.pawn
index 6df8101f..6df8101f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60040-preproc.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60040-preproc.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60050-gh419.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60050-gh419.pawn
index 9db7b08f..9db7b08f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60050-gh419.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60050-gh419.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60100-Issue_2586.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60100-Issue_2586.pawn
index e3eed47c..e3eed47c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60100-Issue_2586.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60100-Issue_2586.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60101-Issue_2665.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60101-Issue_2665.pawn
index 90fcbd07..90fcbd07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/pawn/60101-Issue_2665.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/pawn/60101-Issue_2665.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/sql/02400-mysql.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/sql/02400-mysql.sqc
index ec8ad604..ec8ad604 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/sql/02400-mysql.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/sql/02400-mysql.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/sql/02401-sta-select.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/sql/02401-sta-select.sqc
index 1142c3b9..1142c3b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/sql/02401-sta-select.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/sql/02401-sta-select.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/sql/02402-issue_527.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/sql/02402-issue_527.sqc
index 17ccfa3b..17ccfa3b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/sql/02402-issue_527.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/sql/02402-issue_527.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70000-list.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70000-list.vala
index 1893dcb5..1893dcb5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70000-list.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70000-list.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70001-advanced.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70001-advanced.vala
index c1d581c5..c1d581c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70001-advanced.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70001-advanced.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70010-verbatim_str.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70010-verbatim_str.vala
index 12c1f1a3..12c1f1a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70010-verbatim_str.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70010-verbatim_str.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70011-verbatim_str2.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70011-verbatim_str2.vala
index fc745113..fc745113 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70011-verbatim_str2.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70011-verbatim_str2.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70012-verbatim_str2.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70012-verbatim_str2.vala
index edd0ea67..edd0ea67 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70012-verbatim_str2.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70012-verbatim_str2.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70020-preproc.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70020-preproc.vala
index 9cc1ba1a..9cc1ba1a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70020-preproc.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70020-preproc.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70287-gh287.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70287-gh287.vala
index be39a9db..be39a9db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70287-gh287.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70287-gh287.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70300-Issue_2090.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70300-Issue_2090.vala
index 5b4e1716..5b4e1716 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70300-Issue_2090.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70300-Issue_2090.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70301-Issue_2270.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70301-Issue_2270.vala
index 2202627c..2202627c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70301-Issue_2270.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70301-Issue_2270.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70302-cast.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70302-cast.vala
index 6c5d11db..6c5d11db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70302-cast.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70302-cast.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70303-nullable.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70303-nullable.vala
index 54c24643..54c24643 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70303-nullable.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70303-nullable.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70304-identifier.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70304-identifier.vala
index 5dee8d3b..5dee8d3b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70304-identifier.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70304-identifier.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70310-mdarray_space.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70310-mdarray_space.vala
index 6fd7c360..6fd7c360 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70310-mdarray_space.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70310-mdarray_space.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70311-mdarray_space.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70311-mdarray_space.vala
index c8a51c1e..c8a51c1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70311-mdarray_space.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70311-mdarray_space.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70312-mdarray_space.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70312-mdarray_space.vala
index cf64a5e2..cf64a5e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/expected/vala/70312-mdarray_space.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/expected/vala/70312-mdarray_space.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/fixtest.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/fixtest.sh
index 76fac4bf..76fac4bf 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/fixtest.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/fixtest.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/generate_p_files.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/generate_p_files.sh
index 2327b7c7..2327b7c7 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/generate_p_files.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/generate_p_files.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/imported.test b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/imported.test
index b20f0247..b20f0247 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/imported.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/imported.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/1225.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/1225.c
index c6533cb1..c6533cb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/1225.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/1225.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_2205.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_2205.c
new file mode 100644
index 00000000..7d4c1801
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_2205.c
@@ -0,0 +1,6 @@
+// 2205
+#define MLX_RATE(ee_val) (ee_val & MLX_MASK)
+
+// 3559
+#define my_2_thing(stuff) &object3, &object4
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue-2278.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_2278.c
index 1ecfecf5..1ecfecf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue-2278.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_2278.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_2279.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_2279.c
index 88c0ae84..88c0ae84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_2279.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_2279.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_2360.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_2360.c
index dd4530c7..dd4530c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_2360.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_2360.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_2411.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_2411.c
index 40244488..40244488 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_2411.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_2411.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_2640.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_2640.c
index ba25bcbe..ba25bcbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_2640.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_2640.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_2845.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_2845.h
index 9f34b1dc..9f34b1dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_2845.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_2845.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3169.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3169.c
index bf67ca55..bf67ca55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3169.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3169.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3192.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3192.c
index d8fde2a6..d8fde2a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3192.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3192.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3233.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3233.c
index 5cfdff8f..5cfdff8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3233.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3233.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3269.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3269.c
index 5b7de8e6..5b7de8e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3269.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3269.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3272.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3272.h
index 673c5a91..673c5a91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3272.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3272.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3274.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3274.c
index f8b9f789..f8b9f789 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3274.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3274.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3327.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3327.c
index 883c5436..883c5436 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3327.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3327.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3339.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3339.c
index 9f445c1a..9f445c1a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3339.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3339.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3342.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3342.c
index 986aab70..986aab70 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3342.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3342.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3343.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3343.c
index 3c21608b..3c21608b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3343.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3343.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3345.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3345.c
index eec63b28..eec63b28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3345.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3345.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3351.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3351.c
index 889d731a..889d731a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3351.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3351.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3353.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3353.h
index f189ebfa..f189ebfa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3353.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3353.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3356.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3356.c
index de2dba21..de2dba21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3356.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3356.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3362.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3362.c
index 7a8c08f3..7a8c08f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3362.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3362.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3366.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3366.c
index 769c2f94..769c2f94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3366.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3366.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3370.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3370.c
index 79081331..79081331 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3370.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3370.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3376.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3376.c
index 084e9c7d..084e9c7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3376.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3376.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3377.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3377.c
index 99cb0d84..99cb0d84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3377.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3377.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3402.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3402.c
index 569d5e3a..569d5e3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3402.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3402.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3421.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3421.h
index b66478fb..b66478fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3421.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3421.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3431.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3431.c
index b0d9246d..b0d9246d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3431.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3431.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3436.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3436.c
index d921d9ed..d921d9ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3436.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3436.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3454.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3454.c
index 8be230dd..8be230dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3454.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3454.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3457.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3457.c
index e76affa4..e76affa4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3457.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3457.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3472.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3472.c
index d180a700..d180a700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3472.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3472.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3476.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3476.c
index 92a7b0c0..92a7b0c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3476.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3476.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3480.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3480.c
index 6a25879a..6a25879a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3480.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3480.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3493.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3493.c
index 66554d57..66554d57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3493.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3493.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3496.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3496.h
index b0509bd5..b0509bd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3496.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3496.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3506.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3506.c
index 30db2976..30db2976 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3506.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3506.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3516.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3516.c
index 2f591b75..2f591b75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3516.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3516.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3518.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3518.c
index cf8d0c95..cf8d0c95 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3518.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3518.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3548.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3548.c
index 71824adc..71824adc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3548.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3548.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3556.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3556.c
index 423e07f0..423e07f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3556.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3556.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3559.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3559.c
index 96c73820..96c73820 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3559.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3559.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3561.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3561.c
index db5c5afc..db5c5afc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3561.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3561.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3565.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3565.c
index 267e25bd..267e25bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3565.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3565.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3567.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3567.c
index e81c7672..e81c7672 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3567.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3567.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3580.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3580.c
index 2b6b7e43..2b6b7e43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3580.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3580.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3582.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3582.c
index ebcc648b..ebcc648b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3582.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3582.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3587.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3587.h
index 3744884f..3744884f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3587.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3587.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3601.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3601.c
index a2b92fa0..a2b92fa0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3601.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3601.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3662.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3662.c
index 0435608b..0435608b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3662.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3662.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3873.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3873.c
index e7c96e83..e7c96e83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/Issue_3873.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3873.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3985.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3985.c
new file mode 100644
index 00000000..033e5bb2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3985.c
@@ -0,0 +1,14 @@
+int keep_symbol()
+{
+			if(
+				#ifdef HAVE_BFD_2_34
+				bfd_section_size() == 0
+				#else
+				bfd_get_section_size() == 0
+				#endif
+			)
+			{
+				return false;
+			}
+	return true;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3989.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3989.c
new file mode 100644
index 00000000..34d16b7d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3989.c
@@ -0,0 +1 @@
+int * foo(int *);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3992.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3992.c
new file mode 100644
index 00000000..70b3516a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_3992.c
@@ -0,0 +1,6 @@
+UUID guid_decode()
+{
+	UUID id = {0x00000000, 0x0000, 0x0000, 0x0000, id1 };
+
+	UUID id = {0x00000000, 0x0000, 0x0000, 0x0000, { id2 } };
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_4044.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_4044.c
new file mode 100644
index 00000000..a3f6d2d5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/Issue_4044.c
@@ -0,0 +1,58 @@
+int main(void) {
+    f(1, and_eq.x);
+    f(1, and.x);
+    f(1, asm.x);
+    f(1, atomic_cancel.x);
+    f(1, atomic_commit.x);
+    f(1, atomic_noexcept.x);
+    f(1, bitand.x);
+    f(1, bitor.x);
+    f(1, catch.x);
+    f(1, char16_t.x);
+    f(1, char32_t.x);
+    f(1, char8_t.x);
+    f(1, class.x);
+    f(1, co_await.x);
+    f(1, compl.x);
+    f(1, concept.x);
+    f(1, const_cast.x);
+    f(1, consteval.x);
+    f(1, constinit.x);
+    f(1, co_return.x);
+    f(1, co_yield.x);
+    f(1, decltype.x);
+    f(1, delete.x);
+    f(1, dynamic_cast.x);
+    f(1, explicit.x);
+    f(1, export.x);
+    f(1, friend.x);
+    f(1, mutable.x);
+    f(1, namespace.x);
+    f(1, new.x);
+    f(1, noexcept.x);
+    f(1, normal.x);
+    f(1, not_eq.x);
+    f(1, not.x);
+    f(1, operator.x);
+    f(1, or_eq.x);
+    f(1, or.x);
+    f(1, private.x);
+    f(1, protected.x);
+    f(1, public.x);
+    f(1, reflexpr.x);
+    f(1, reinterpret_cast.x);
+    f(1, requires.x);
+    f(1, static_cast.x);
+    f(1, synchronized.x);
+    f(1, template.x);
+    f(1, this.x);
+    f(1, throw.x);
+    f(1, try.x);
+    f(1, typeid.x);
+    f(1, typename.x);
+    f(1, using.x);
+    f(1, virtual.x);
+    f(1, wchar_t.x);
+    f(1, xor_eq.x);
+    f(1, xor.x);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/add_long_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/add_long_comment.c
index 5900de52..5900de52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/add_long_comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/add_long_comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-equ.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align-equ.c
index 374ccbfb..374ccbfb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-equ.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align-equ.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-proto-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align-proto-vars.c
index e1dd71ff..e1dd71ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-proto-vars.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align-proto-vars.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-proto.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align-proto.c
index 64dfce00..64dfce00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-proto.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align-proto.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-string.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align-string.c
index f652e88f..f652e88f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-string.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align-string.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-struct-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align-struct-init.c
index 084994ff..084994ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-struct-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align-struct-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align-typedef.c
index ae17eb4d..ae17eb4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-typedef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align-typedef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align-var.c
index adbf8a98..adbf8a98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align-var.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align-var.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_assign_var_defs.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_assign_var_defs.c
index 0f25a246..0f25a246 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_assign_var_defs.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_assign_var_defs.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_assigns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_assigns.c
index e0742dd6..e0742dd6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_assigns.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_assigns.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_attr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_attr.c
index 0f4cfee1..0f4cfee1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_attr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_attr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_func_proto_star_amp.h
index 17a7c5ce..17a7c5ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_keep_extra.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_keep_extra.c
index 2bc0f532..2bc0f532 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_keep_extra.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_keep_extra.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_sf_call_span_418.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_sf_call_span_418.c
index 421b9547..421b9547 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_sf_call_span_418.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_sf_call_span_418.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_sf_call_span_419.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_sf_call_span_419.c
index 421b9547..421b9547 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_sf_call_span_419.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_sf_call_span_419.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_sf_call_thresh_416.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_sf_call_thresh_416.c
index f4f6606e..f4f6606e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_sf_call_thresh_416.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_sf_call_thresh_416.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_sf_call_thresh_417.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_sf_call_thresh_417.c
index c3c881eb..c3c881eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_sf_call_thresh_417.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_sf_call_thresh_417.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_stack.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_stack.c
index 0f88df06..0f88df06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_stack.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_stack.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_trailing_do_cmt.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_trailing_do_cmt.c
index 372da441..372da441 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/align_trailing_do_cmt.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/align_trailing_do_cmt.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/asm.c
index 1fb5015c..1fb5015c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/asm.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/asm.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/attribute.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/attribute.c
index babe229f..babe229f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/attribute.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/attribute.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/backslash-newline-lex.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/backslash-newline-lex.c
index 0f20388c..0f20388c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/backslash-newline-lex.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/backslash-newline-lex.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/beautifier-off.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/beautifier-off.c
index 033179cb..033179cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/beautifier-off.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/beautifier-off.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bits.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bits.c
index 9a12f484..9a12f484 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bits.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bits.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bool-pos.c
index d6887223..d6887223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/br_cmt.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/br_cmt.c
index 4e57d2de..4e57d2de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/br_cmt.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/br_cmt.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/brace-remove.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/brace-remove.c
index c62506e3..c62506e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/brace-remove.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/brace-remove.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/brace-remove2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/brace-remove2.c
index e5b73723..e5b73723 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/brace-remove2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/brace-remove2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/brace-remove3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/brace-remove3.c
index 9cde8bbd..9cde8bbd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/brace-remove3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/brace-remove3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/brace.c
index 31f3b42b..31f3b42b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/braces-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/braces-2.c
index a34d73d8..a34d73d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/braces-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/braces-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/braces-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/braces-3.c
index 1f1a2066..1f1a2066 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/braces-3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/braces-3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/braces-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/braces-4.c
index 385f4a8e..385f4a8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/braces-4.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/braces-4.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/braces-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/braces-5.c
index c77cc912..c77cc912 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/braces-5.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/braces-5.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/braces.c
index 20733afc..20733afc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bsnl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bsnl.c
index b2b38b8e..b2b38b8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bsnl.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bsnl.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_1041.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_1041.c
index 193c750b..193c750b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_1041.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_1041.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_1196.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_1196.c
index 9fdabca6..9fdabca6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_1196.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_1196.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_1702.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_1702.c
index bf74c8bd..bf74c8bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_1702.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_1702.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_1718.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_1718.c
index eaddc974..eaddc974 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_1718.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_1718.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_2331.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_2331.c
index f30c53d3..f30c53d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_2331.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_2331.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_3156.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_3156.c
index 508a0098..508a0098 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_3156.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_3156.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_489.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_489.c
index e83d351b..e83d351b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_489.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_489.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sp_after_sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_637.c
index 8a86dd25..8a86dd25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sp_after_sparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_637.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_671.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_671.c
index 01a3b02b..01a3b02b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_671.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_671.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_i_222.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_i_222.c
index 4f0ded31..4f0ded31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_i_222.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_i_222.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_i_771.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_i_771.c
index c933487d..c933487d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_i_771.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_i_771.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_i_876.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_i_876.c
index ab2a05db..ab2a05db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bug_i_876.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bug_i_876.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bugs-1.c
index 39050c07..39050c07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bugs-1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bugs-2.c
index 42bed259..42bed259 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bugs-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bugs-3.c
index 4f85044a..4f85044a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bugs-3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bugs-4.c
index e01c2c32..e01c2c32 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-4.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bugs-4.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bugs-5.c
index 626eb7e6..626eb7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-5.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bugs-5.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-6.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bugs-6.c
index 99ebbdda..99ebbdda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-6.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bugs-6.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-7.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bugs-7.c
index a879aa17..a879aa17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-7.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bugs-7.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bugs-8.c
index 8870a663..8870a663 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs-8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bugs-8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bugs.c
index d75a4782..d75a4782 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/bugs.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/bugs.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/case-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/case-nl_before_return.c
index 67adaddd..67adaddd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/case-nl_before_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/case-nl_before_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/case.c
index ffceda0e..ffceda0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cast_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/cast_brace.c
index 7ec7f67a..7ec7f67a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cast_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/cast_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/casts.c
index f09f5c5e..f09f5c5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/clang-has_include.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/clang-has_include.h
index d153e70a..d153e70a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/clang-has_include.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/clang-has_include.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt-align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/cmt-align.c
index 658bac4d..658bac4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt-align.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/cmt-align.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt_multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/cmt_multi.c
index 8e01c5fc..8e01c5fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt_multi.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/cmt_multi.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt_multi_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/cmt_multi_utf8.c
index 05b01f84..05b01f84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt_multi_utf8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/cmt_multi_utf8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt_nl_end.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/cmt_nl_end.c
index 48929d07..48929d07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt_nl_end.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/cmt_nl_end.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt_reflow.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/cmt_reflow.c
index 6c40e11b..6c40e11b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt_reflow.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/cmt_reflow.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt_right_align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/cmt_right_align.c
index b707f0bb..b707f0bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cmt_right_align.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/cmt_right_align.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/code_width.c
index 2262afe3..2262afe3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/code_width.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/code_width.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/colon-asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/colon-asm.c
index 5125af19..5125af19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/colon-asm.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/colon-asm.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/comment-convert.c
index 4282ab0b..4282ab0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/comment-convert.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/comment-convert.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/comment-indent.c
index d5295d6e..d5295d6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/comment_conversion_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/comment_conversion_define.c
new file mode 100644
index 00000000..9c2e7c3e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/comment_conversion_define.c
@@ -0,0 +1,24 @@
+#define HDROFF_TYPE(b)      sizeof(ElfPreHeader)             /* ElfXX_Half  e_type; */
+
+typedef struct _libr_file
+{
+  unsigned int  version;
+} libr_file;
+
+#define HDROFF_TYPE(b)      sizeof(    /* ElfXX_Half  e_type; */    \
+		ElfPreHeader /* ElfXX_Half  e_type; */ \
+		) /* Repeat ElfXX_Half  e_type; */
+
+/* ElfXX_Half  e_shstrndx; */
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS  /* TEST */
+
+/* Do something */
+void foo()
+{
+	/* comment */
+	int i = 0;
+}
+
+#endif
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/comment_conversion_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/comment_conversion_endif.c
new file mode 100644
index 00000000..0ceb5428
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/comment_conversion_endif.c
@@ -0,0 +1,24 @@
+#ifndef DOXYGEN_SHOULD_SKIP_THIS  /* TEST1 */
+
+void foo()
+{
+	int i = 0;
+}
+
+#elif defined(sgi) && sgi /* TEST2 */
+
+void bar()
+{
+	int j = 0;
+}
+
+#else /* TEST3 */
+
+void foobar()
+{
+	int j = 0;
+}
+
+#endif /* END TEST */
+
+void main();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/comment_conversion_javadoc_single.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/comment_conversion_javadoc_single.c
new file mode 100644
index 00000000..cf236408
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/comment_conversion_javadoc_single.c
@@ -0,0 +1,21 @@
+/* Normal comment */
+
+/** Javadoc comment */
+
+/* Multiline
+ * Normal
+ * comment */
+
+/* Another
+   Multiline
+   Normal
+   comment
+*/
+
+/**
+ * Javadoc
+ * Multiline
+ * Normal
+ * comment
+*/
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/comment_conversion_long_lines.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/comment_conversion_long_lines.c
new file mode 100644
index 00000000..3aab1d86
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/comment_conversion_long_lines.c
@@ -0,0 +1,12 @@
+char *libr_extract_resources(libr_file *handle)
+{
+	/* If this library cannot dynamically load resources then pull out all the resources to a temporary directory */
+	if(temp_folder != NULL)
+		temp_folder = strdup(temp_folder);
+
+	// If this library cannot dynamically load resources then pull out all the resources to a temporary directory
+	if(temp_folder2 != NULL)
+		temp_folder2 = strdup(temp_folder);
+
+	/* If this library /*cannot dynamically load resources then pull out all the resources to a temporary directory. Repeat to make the line even longer. If this library cannot dynamically load resources then pull out all the resources to a temporary directory.*/
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/comment_conversion_trailing_c_multiline.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/comment_conversion_trailing_c_multiline.c
new file mode 100644
index 00000000..ff59f5ac
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/comment_conversion_trailing_c_multiline.c
@@ -0,0 +1,25 @@
+typedef enum {
+	LIBR_ERROR_EXPANDSECTION = -20, /** Failed to set output file architecture to input file architecture */
+	LIBR_ERROR_OVERWRITE     = -21  /** Section already exists, over-write not specified */
+} libr_status;
+
+typedef enum
+{
+	LIBR_ERROR_EXPANDSECTION = -20, /* Failed to set output file architecture to input file
+	                                   architecture */
+	LIBR_ERROR_OVERWRITE     = -21  /* Section already exists, over-write not specified */
+} libr_status;
+
+typedef enum
+{
+	LIBR_ERROR_EXPANDSECTION = -20, /** Failed to set output file architecture to input file
+	                                    architecture */
+	LIBR_ERROR_OVERWRITE     = -21  /* Section already exists, over-write not specified */
+} libr_status;
+
+typedef enum
+{
+	LIBR_ERROR_EXPANDSECTION = -20, // Failed to set output file architecture to input file
+	                                // architecture
+	LIBR_ERROR_OVERWRITE     = -21  // Section already exists, over-write not specified
+} libr_status;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/cond.c
index aec2f0a3..aec2f0a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/cond.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/cond.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/custom_types_ssl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/custom_types_ssl.c
index 0454f81d..0454f81d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/custom_types_ssl.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/custom_types_ssl.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/define-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/define-if-indent.c
index 1ef47273..1ef47273 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/define-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/define-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/deref.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/deref.c
index 100464fb..100464fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/deref.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/deref.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/directfb.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/directfb.h
index 3531fa21..3531fa21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/directfb.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/directfb.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/dos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/dos.c
index 108c3b1c..108c3b1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/dos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/dos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/double-sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/double-sparen.c
index e76c3ea1..e76c3ea1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/double-sparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/double-sparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/doxy-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/doxy-comment.c
index ef0414ac..ef0414ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/doxy-comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/doxy-comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/else-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/else-if.c
index 06cc37f2..06cc37f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/else-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/else-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/empty-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/empty-braces.c
index f1c1ec78..f1c1ec78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/empty-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/empty-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/empty-for.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/empty-for.c
index d9fb686a..d9fb686a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/empty-for.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/empty-for.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/endif.c
index fd621299..fd621299 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/enum-struct-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/enum-struct-init.c
index 6660e4a4..6660e4a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/enum-struct-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/enum-struct-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/enum_comma_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/enum_comma_ifdef.c
index aa80cf48..aa80cf48 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/enum_comma_ifdef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/enum_comma_ifdef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/enum_gallery.c
index 2be93194..2be93194 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/enum_gallery.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/enum_gallery.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/extern.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/extern.c
index 3bcfcbe5..3bcfcbe5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/extern.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/extern.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/fcn_indent.c
index ff9f812b..ff9f812b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/fcn_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/fcn_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/fcn_indent_func_def_col1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/fcn_indent_func_def_col1.c
index 235731c2..235731c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/fcn_indent_func_def_col1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/fcn_indent_func_def_col1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/fcn_type.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/fcn_type.c
index d49d381d..d49d381d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/fcn_type.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/fcn_type.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/for-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/for-space.c
index 1064d493..1064d493 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/for-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/for-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/forever.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/forever.c
index 94dc8ce1..94dc8ce1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/forever.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/forever.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/freebsd.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/freebsd.c
index 37a17cb5..37a17cb5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/freebsd.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/freebsd.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/func_call_user.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/func_call_user.c
index 275d8c5e..275d8c5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/func_call_user.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/func_call_user.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/func_call_user2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/func_call_user2.c
index 38ecb232..38ecb232 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/func_call_user2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/func_call_user2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/func_var_multi_paren.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/func_var_multi_paren.c
index aefbde49..aefbde49 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/func_var_multi_paren.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/func_var_multi_paren.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/func_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/func_wrap.c
index 7589d03b..7589d03b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/func_wrap.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/func_wrap.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/funcfunc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/funcfunc.c
index ee717abc..ee717abc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/funcfunc.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/funcfunc.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/function-def.c
index 778d121f..778d121f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/function-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/function-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/function_prototypes_alignment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/function_prototypes_alignment.c
new file mode 100644
index 00000000..4a73bf30
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/function_prototypes_alignment.c
@@ -0,0 +1,15 @@
+libr_intstatus set_data1(libr_file *file_handle, libr_section *scn, libr_data *data, off_t offset, char *buffer, size_t size);
+void write_output1(libr_file *file_handle);
+libr_intstatus open_handles1(libr_file *file_handle, char *filename, libr_access_t access);
+
+libr_intstatus set_data2(libr_file *file_handle, libr_section *scn, libr_data *data, off_t offset, char *buffer, size_t size);
+libr_intstatus open_handles2(libr_file *file_handle, char *filename, libr_access_t access);
+void write_output2(libr_file *file_handle);
+
+INTERNAL_FN libr_intstatus set_data1(libr_file *file_handle, libr_section *scn, libr_data *data, off_t offset, char *buffer, size_t size);
+INTERNAL_FN void write_output1(libr_file *file_handle);
+INTERNAL_FN libr_intstatus open_handles1(libr_file *file_handle, char *filename, libr_access_t access);
+
+INTERNAL_FN libr_intstatus set_data2(libr_file *file_handle, libr_section *scn, libr_data *data, off_t offset, char *buffer, size_t size);
+INTERNAL_FN libr_intstatus open_handles2(libr_file *file_handle, char *filename, libr_access_t access);
+INTERNAL_FN void write_output2(libr_file *file_handle);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/gh399.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/gh399.c
index 00f868a3..00f868a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/gh399.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/gh399.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/global-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/global-vars.c
index 9576341b..9576341b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/global-vars.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/global-vars.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/hello.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/hello.c
index 5849783c..5849783c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/hello.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/hello.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/i1270.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/i1270.c
index 4831a47a..4831a47a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/i1270.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/i1270.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/i1413.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/i1413.c
index 4287ca86..4287ca86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/i1413.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/i1413.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/i1564.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/i1564.c
index c906ef9b..c906ef9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/i1564.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/i1564.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/i2c-core.c
index 29bdb584..29bdb584 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/i2c-core.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/i2c-core.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/if_chain.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/if_chain.c
index 948492dd..948492dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/if_chain.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/if_chain.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/ifdef-indent.c
index 5043c01f..5043c01f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/ifdef-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/ifdef-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/ifdef-nest.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/ifdef-nest.c
index 68baf1fc..68baf1fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/ifdef-nest.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/ifdef-nest.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/incdec_postfix_multiply.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/incdec_postfix_multiply.c
index 51c2b3a3..51c2b3a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/incdec_postfix_multiply.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/incdec_postfix_multiply.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/include-guard.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/include-guard.h
index 03625573..03625573 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/include-guard.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/include-guard.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/include_define.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/include_define.h
index 13380cac..13380cac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/include_define.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/include_define.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/indent-assign.c
index 58ed9c52..58ed9c52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent-assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/indent-assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent-macro-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/indent-macro-brace.c
index 8c3f9941..8c3f9941 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent-macro-brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/indent-macro-brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent-off-after-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/indent-off-after-assign.c
index d01f58c0..d01f58c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent-off-after-assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/indent-off-after-assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent-vbrace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/indent-vbrace.c
index 8b48e235..8b48e235 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent-vbrace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/indent-vbrace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent_first_bool_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/indent_first_bool_expr.c
index ec68ac3a..ec68ac3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent_first_bool_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/indent_first_bool_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent_ternary-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/indent_ternary-1.c
index b76e375b..b76e375b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent_ternary-1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/indent_ternary-1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent_ternary-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/indent_ternary-2.c
index 20f1df64..20f1df64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/indent_ternary-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/indent_ternary-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/infinite-loops.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/infinite-loops.c
index 71d52db7..71d52db7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/infinite-loops.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/infinite-loops.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/int-types.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/int-types.c
index 72073e28..72073e28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/int-types.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/int-types.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/kw_subst.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/kw_subst.c
index 5d37f823..5d37f823 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/kw_subst.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/kw_subst.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/lvalue.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/lvalue.c
index 2f2cc17d..2f2cc17d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/lvalue.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/lvalue.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/mac.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/mac.c
index ce4e7937..ce4e7937 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/mac.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/mac.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/macro-returns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/macro-returns.c
index 0febb263..0febb263 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/macro-returns.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/macro-returns.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/minus-minus.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/minus-minus.c
index 4eb69237..4eb69237 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/minus-minus.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/minus-minus.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/misc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/misc.c
index cd948007..cd948007 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/misc.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/misc.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/mod-paren.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/mod-paren.c
index 14bb9836..14bb9836 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/mod-paren.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/mod-paren.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/mod_case_brace.c
index 4bd9abde..4bd9abde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/mod_case_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/mod_case_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/mod_move_case_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/mod_move_case_return.c
index 38dd6a62..38dd6a62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/mod_move_case_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/mod_move_case_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/mod_move_case_return_bad.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/mod_move_case_return_bad.c
index 95d3fb09..95d3fb09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/mod_move_case_return_bad.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/mod_move_case_return_bad.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/multi.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/multi.h
index 33acea34..33acea34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/multi.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/multi.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/my_infile.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/my_infile.c
index 8b8cd113..8b8cd113 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/my_infile.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/my_infile.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/negative_value.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/negative_value.c
index 6399fbef..6399fbef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/negative_value.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/negative_value.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/newline_after_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/newline_after_endif.c
index 2a0cbe62..2a0cbe62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/newline_after_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/newline_after_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl-comment.c
index 70c49200..70c49200 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl-comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl-comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl-cont.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl-cont.c
index 9f87950f..9f87950f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl-cont.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl-cont.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl-cont2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl-cont2.c
index b3f079e3..b3f079e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl-cont2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl-cont2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl-semicolon.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl-semicolon.c
index 8e0f59d3..8e0f59d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl-semicolon.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl-semicolon.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl-ver-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl-ver-def.c
index 9684ed27..9684ed27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl-ver-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl-ver-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl_assign.c
index b2495c13..b2495c13 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl_assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_before_ignore_after_case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl_before_ignore_after_case.c
index 51866fe4..51866fe4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_before_ignore_after_case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl_before_ignore_after_case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl_before_return.c
index da5ed3eb..da5ed3eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_before_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl_before_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_create_one_liner.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl_create_one_liner.c
index 16887eca..16887eca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_create_one_liner.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl_create_one_liner.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_ds_struct_enum.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl_ds_struct_enum.c
index d19964ae..d19964ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_ds_struct_enum.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl_ds_struct_enum.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl_endif.c
index d738d74a..d738d74a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_func_call.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl_func_call.c
index 7af891a1..7af891a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_func_call.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl_func_call.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_proto_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl_proto_endif.c
index f50766b8..f50766b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_proto_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl_proto_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl_return_expr.c
index e917e399..e917e399 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/nl_return_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/nl_return_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/one-liner-define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/one-liner-define.c
index fdb02e31..fdb02e31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/one-liner-define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/one-liner-define.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/one-liner-init.c
index 91d92d55..91d92d55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/one-liner-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/one-liner-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/one_liners.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/one_liners.c
index 1f6e0d3e..1f6e0d3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/one_liners.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/one_liners.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/paren-indent.c
index df5b1c14..df5b1c14 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/paren-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/paren-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/paren_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/paren_indent.c
index 4b0ff447..4b0ff447 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/paren_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/paren_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/parenthesized_indirect_call.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/parenthesized_indirect_call.c
index 3d5a6819..3d5a6819 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/parenthesized_indirect_call.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/parenthesized_indirect_call.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pascal_ptr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pascal_ptr.c
index 5b0116ba..5b0116ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pascal_ptr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pascal_ptr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pos_compare.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pos_compare.c
index b0942de0..b0942de0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pos_compare.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pos_compare.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pos_conditional.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pos_conditional.c
index 100545e5..100545e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pos_conditional.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pos_conditional.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp-before-func-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pp-before-func-def.c
index 948ce135..948ce135 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp-before-func-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pp-before-func-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pp-if-indent.c
index cd9d6c4d..cd9d6c4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pp-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp-nest.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pp-nest.c
index b602471b..b602471b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp-nest.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pp-nest.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pp-space.c
index 67cf3e55..67cf3e55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pp-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp_concat_asn1.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pp_concat_asn1.h
index 9874cf04..9874cf04 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp_concat_asn1.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pp_concat_asn1.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp_indent_with_tabs.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pp_indent_with_tabs.c
index d32c568d..d32c568d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp_indent_with_tabs.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pp_indent_with_tabs.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp_multiline_define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pp_multiline_define.c
index 3ac9db6b..8e44b1c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp_multiline_define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pp_multiline_define.c
@@ -1,5 +1,8 @@
 #define gettext(Msgid) \
     QWERTY0 Msgid;
+#define farright(Msgid)       \
+                                        \
+    QWERTY0 Msgid;
 #ifdef TEST
 #define gettext1(Msgid) \
 	if (true) \
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp_ret.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pp_ret.c
index c35e4294..c35e4294 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp_ret.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pp_ret.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp_space_before_after.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pp_space_before_after.c
index 3f801dc7..3f801dc7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pp_space_before_after.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pp_space_before_after.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pragma.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pragma.c
index a0dcd975..a0dcd975 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pragma.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pragma.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pragma_asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pragma_asm.c
index a7834613..a7834613 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/pragma_asm.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/pragma_asm.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/preproc-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/preproc-if.c
index 71fbf792..71fbf792 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/preproc-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/preproc-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/return-compound-literal.c
index 8547c3a7..8547c3a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/return-compound-literal.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/return-compound-literal.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/return-multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/return-multi.c
index 846ca21c..846ca21c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/return-multi.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/return-multi.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/semicolons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/semicolons.c
index d7e2379a..d7e2379a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/semicolons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/semicolons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sf588.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/sf588.c
index d1c5f1cc..d1c5f1cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sf588.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/sf588.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sf594.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/sf594.c
index cd08cce6..cd08cce6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sf594.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/sf594.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/single_line_comment_after.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/single_line_comment_after.c
index 527b3e80..527b3e80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/single_line_comment_after.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/single_line_comment_after.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sort_include.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/sort_include.c
index 0f1956d2..0f1956d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sort_include.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/sort_include.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/sp_after_sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/sp_after_sparen.c
new file mode 100644
index 00000000..7f31bdf6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/sp_after_sparen.c
@@ -0,0 +1,9 @@
+if (true)   x();
+
+while (true)x();
+
+while(true)   x();
+
+for (;;)    {
+  x()
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/sp_cmt_cpp_start.c
index b9b07287..b9b07287 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sp_cmt_cpp_start.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/sp_cmt_cpp_start.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sp_embed_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/sp_embed_comment.c
index 88a54dff..88a54dff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sp_embed_comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/sp_embed_comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sp_func_call_user_inside_fparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/sp_func_call_user_inside_fparen.c
index ba921b9f..ba921b9f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sp_func_call_user_inside_fparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/sp_func_call_user_inside_fparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/sparen-indent.c
index fe770681..fe770681 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/sparen-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/sparen-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/star-style.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/star-style.c
index aab9ccec..aab9ccec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/star-style.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/star-style.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/string_prefixes.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/string_prefixes.c
index e901c9ac..e901c9ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/string_prefixes.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/string_prefixes.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/string_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/string_utf8.c
index a473e1bf..a473e1bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/string_utf8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/string_utf8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/struct-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/struct-brace.c
index 7d08b4ca..7d08b4ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/struct-brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/struct-brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/switch-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/switch-case.c
index add9fcfa..add9fcfa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/switch-case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/switch-case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/switch.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/switch.c
index 5b760363..5b760363 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/switch.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/switch.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/t3.in.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/t3.in.c
index e352f736..e352f736 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/t3.in.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/t3.in.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/type-cast.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/type-cast.c
index 5760b466..5760b466 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/type-cast.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/type-cast.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/type_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/type_wrap.c
index 13b74455..13b74455 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/type_wrap.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/type_wrap.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/utf8-identifiers.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/utf8-identifiers.c
index e3281aac..e3281aac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/utf8-identifiers.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/utf8-identifiers.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/vardefcol.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/vardefcol.c
index bdb40e8f..bdb40e8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/vardefcol.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/vardefcol.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/various_colons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/various_colons.c
index 516a5a72..516a5a72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/various_colons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/various_colons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/vb-do.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/vb-do.c
index 1cefd1df..1cefd1df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/vb-do.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/vb-do.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/vb-pp.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/vb-pp.c
index 5ea209c5..5ea209c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/vb-pp.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/vb-pp.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/vb-while.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/vb-while.c
index 22291748..22291748 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/vb-while.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/vb-while.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/vbrace_one_liner.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/vbrace_one_liner.c
index 5db805a7..5db805a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/vbrace_one_liner.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/vbrace_one_liner.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/whole_file_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/whole_file_ifdef.c
index bb16e116..bb16e116 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/whole_file_ifdef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/whole_file_ifdef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/xml.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/xml.c
index fe7afdf4..fe7afdf4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/c/xml.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/c/xml.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/2138.cpp
index e0379b43..e0379b43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/2138.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/2138.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/2185.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/2185.cpp
index 6f874926..6f874926 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/2185.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/2185.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/2203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/2203.cpp
index 4a2c05fa..4a2c05fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/2203.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/2203.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/621_this-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/621_this-spacing.cpp
index bd28a5e8..bd28a5e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/621_this-spacing.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/621_this-spacing.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/622_ifdef-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/622_ifdef-indentation.cpp
index a6aface7..a6aface7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/622_ifdef-indentation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/622_ifdef-indentation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/623_caret-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/623_caret-spacing.cpp
index ad1ed6f7..ad1ed6f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/623_caret-spacing.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/623_caret-spacing.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/633_decl-in-func-typedef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/633_decl-in-func-typedef.cpp
index 4e18c597..4e18c597 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/633_decl-in-func-typedef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/633_decl-in-func-typedef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/634_extern-c-no-block.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/634_extern-c-no-block.cpp
index bb6b14fb..bb6b14fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/634_extern-c-no-block.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/634_extern-c-no-block.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/DB.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/DB.cpp
index 1b8f4bc8..1b8f4bc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/DB.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/DB.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/DefaultAndDelete.cpp
index 3c4f3b9e..3c4f3b9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/DefaultAndDelete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/DefaultAndDelete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Discussion_3987.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Discussion_3987.cpp
new file mode 100644
index 00000000..e4d0dad9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Discussion_3987.cpp
@@ -0,0 +1,5 @@
+static void append_tag_name(UncText &txt, Chunk *pc)
+{
+   LOG_FUNC_ENTRY();
+   Chunk *tmp = pc->GetPrevNcNnl();
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/DoxygenComments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/DoxygenComments.cpp
index dfa5a906..dfa5a906 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/DoxygenComments.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/DoxygenComments.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Example.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Example.h
index deede79a..deede79a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Example.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Example.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/I1112-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/I1112-1.cpp
index 365df31f..365df31f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/I1112-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/I1112-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/I1112-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/I1112-2.cpp
index c3765ce4..c3765ce4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/I1112-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/I1112-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/I1112-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/I1112-3.cpp
index 6c48cb63..6c48cb63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/I1112-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/I1112-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/I2102.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/I2102.cpp
index d8cf883a..d8cf883a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/I2102.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/I2102.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/I2103.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/I2103.cpp
index c35fbe56..c35fbe56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/I2103.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/I2103.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1052.cpp
index 19461b71..19461b71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1052.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1052.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1130.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1130.cpp
new file mode 100644
index 00000000..201ed38c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1130.cpp
@@ -0,0 +1,39 @@
+void ABC()
+{
+bool bb = true;
+bool ccc = true;
+char x;
+// simple: E1 ? E2 : E3
+x =
+   bb  ?
+               'T'
+                  : 'F';
+// simple_R: E1 ? E2 : E1r ? E2r : E3r
+x =
+   bb  ?
+               'T'
+                  : ccc ?
+  'r'
+      : 'F';
+ simple_L: E1 ? E1l ? E2l : E3l : E3
+x =
+   bb  ?
+                  (ccc) ?
+               't'
+  : 'l'
+      : 'F';
+// CDanU E1 ? E1l ? E2ll : E1ll ? E3ll : E3l : E3
+x =
+   (bb) ?
+       (is_newline_tmp) ? 'n'
+            : (is_comment_tmp) ? 'c'
+               : 'o'
+                  : '-';
+
+
+//CDanU E1 ?  E1l              ? E2ll : E1ll              ? E3ll : E3l : E3
+// x = (y) ?  _is_newline(tmp) ? 'n'  :  _is_comment(tmp) ? 'c'  : 'o' : '-';
+//                                     |E1______________ c E2_ C E3_|
+//           |E1______________ b E2_ B E3___________________________|
+//    |E1_ a E2_____________________________________________________ A E3|
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1167.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1167.cpp
index 6a9042c2..6a9042c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1167.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1167.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1184.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1184.cpp
index 7c69e7fb..7c69e7fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1184.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1184.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1460.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1460.h
index 63787999..63787999 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1460.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1460.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1511.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1511.cpp
index 2583c0e3..2583c0e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1511.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1511.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1692.cpp
index 4a2c97b5..4a2c97b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1692.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1692.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1703.cpp
index bca40664..bca40664 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1703.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1703.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1704.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1704.cpp
index 90cb2049..90cb2049 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1704.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1704.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1733.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1733.cpp
index 10be5586..10be5586 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1733.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1733.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1734.cpp
index 31d08c29..31d08c29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1734.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1734.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1737.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1737.cpp
index fd8b1384..fd8b1384 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1737.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1737.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1753.cpp
index bf5530c3..bf5530c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1753.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1753.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1813-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1813-2.cpp
index 9c02605a..9c02605a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1813-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1813-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1813-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1813-3.cpp
index 93e0799c..93e0799c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1813-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1813-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1813.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1813.cpp
index 0c07555d..0c07555d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1813.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1813.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1923.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1923.cpp
index e5b3ceeb..e5b3ceeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1923.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1923.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1966.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1966.cpp
index 80b7ddc7..80b7ddc7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_1966.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_1966.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2020.cpp
index 94d0aa28..94d0aa28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2020.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2020.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2045.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2045.cpp
index 627eba3f..627eba3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2045.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2045.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2085.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2085.cpp
index 581f4db4..581f4db4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2085.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2085.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2091.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2091.cpp
index 6e32d683..6e32d683 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2091.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2091.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2099.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2099.cpp
index 4726f44b..4726f44b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2099.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2099.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2101.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2101.cpp
index 3e07c686..3e07c686 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2101.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2101.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2138.cpp
index ad53fa57..ad53fa57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2138.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2138.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2149.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2149.cpp
index 88fb2249..88fb2249 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2149.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2149.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2150.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2150.cpp
index 1e4d6bf5..1e4d6bf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2150.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2150.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2151.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2151.cpp
index dce02df3..dce02df3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2151.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2151.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2163.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2163.cpp
index 543b9827..543b9827 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2163.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2163.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2166.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2166.cpp
index d9ac55c7..d9ac55c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2166.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2166.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2170.cpp
index beeffc7e..beeffc7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2170.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2170.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2186.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2186.cpp
index c9cbacda..c9cbacda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2186.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2186.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2195.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2195.cpp
index 3573b20d..3573b20d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2195.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2195.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2219.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2219.cpp
index cb6e24bf..cb6e24bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2219.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2219.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2224.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2224.cpp
index 65382eb9..65382eb9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2224.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2224.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2229.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2229.cpp
index 9f575dc1..9f575dc1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2229.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2229.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2232.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2232.cpp
index 7632ed27..7632ed27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2232.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2232.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2236.cpp
index 5dbc4fbe..5dbc4fbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2236.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2236.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2250.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2250.cpp
index 9268c2e3..9268c2e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2250.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2250.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2281.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2281.cpp
index 44b9e75f..44b9e75f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2281.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2281.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2302.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2302.cpp
index 4763c574..4763c574 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2302.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2302.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2305.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2305.cpp
index 1b35ac11..1b35ac11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2305.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2305.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2319.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2319.cpp
index 8c0ae3e9..8c0ae3e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2319.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2319.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2332.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2332.cpp
index 0bc9cf8f..0bc9cf8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2332.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2332.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2343.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2343.cpp
index 837b0506..837b0506 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2343.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2343.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2345-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2345-3.cpp
index 787ce29b..787ce29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2345-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2345-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2345-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2345-4.cpp
index 9478d63e..9478d63e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2345-4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2345-4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2368.cpp
index 08d0556b..08d0556b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2368.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2368.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2383.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2383.cpp
index 356fd9af..356fd9af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2383.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2383.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2386.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2386.cpp
index ac0b1dd4..ac0b1dd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2386.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2386.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2387.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2387.cpp
index af00e16e..af00e16e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2387.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2387.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2428.cpp
index c919d5a5..c919d5a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2437.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2437.cpp
index 2a64bd8f..2a64bd8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2437.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2437.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2440.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2440.cpp
index c52c30da..c52c30da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2440.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2440.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2440_nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2440_nl.cpp
index c52c30da..c52c30da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2440_nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2440_nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2478.cpp
index fbcfec1f..fbcfec1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2478.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2478.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2561.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2561.cpp
index 15232fc4..15232fc4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2561.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2561.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2565.cpp
index 721d4d78..721d4d78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2565.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2565.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2570.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2570.cpp
index 44373e77..44373e77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2570.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2570.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2574.cpp
index fc79cd0d..fc79cd0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2582.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2582.cpp
index adf9bfe9..adf9bfe9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2582.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2582.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2591.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2591.cpp
index 01ed232e..01ed232e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2591.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2591.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2594.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2594.cpp
index 798a719a..798a719a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2594.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2594.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2596.cpp
index d2517e8b..d2517e8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2596.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2596.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2604.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2604.cpp
index e73c67a8..e73c67a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2604.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2604.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2668.cpp
index 1e2f5d02..1e2f5d02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2668.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2668.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2672-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2672-a.cpp
index d29d2c47..d29d2c47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2672-a.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2672-a.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2672-b.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2672-b.cpp
index f484d4ff..f484d4ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2672-b.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2672-b.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2688.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2688.cpp
index 0b394620..0b394620 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2688.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2688.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2689.cpp
index ef3b5a4b..ef3b5a4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2689.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2689.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2692.cpp
index 4173ad5d..4173ad5d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2692.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2692.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2703.cpp
index ec4554e9..ec4554e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2703.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2703.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2726.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2726.cpp
index 7b76eb43..7b76eb43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2726.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2726.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2734.cpp
index 7b85c0ec..7b85c0ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2734.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2734.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2735.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2735.cpp
index f83e3536..f83e3536 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2735.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2735.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2742.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2742.cpp
index 9d76fe44..9d76fe44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2742.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2742.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2752.cpp
index 237c8ce1..237c8ce1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2757.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2757.cpp
index 3c84969b..3c84969b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2757.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2757.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2758.cpp
index 1ac9a86e..1ac9a86e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2758.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2758.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2759.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2759.cpp
index cbe9c4a5..cbe9c4a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2759.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2759.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2771.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2771.cpp
index ab7c285f..ab7c285f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2771.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2771.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2794.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2794.cpp
index 03f2ae4c..03f2ae4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2794.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2794.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2795.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2795.cpp
index 6cb7e112..6cb7e112 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2795.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2795.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2823.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2823.cpp
index eb0228c9..eb0228c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2823.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2823.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2831.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2831.cpp
index f2dc1717..f2dc1717 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2831.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2831.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2836.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2836.cpp
index 44272d56..44272d56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2836.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2836.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2873.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2873.cpp
index af3020d3..af3020d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2873.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2873.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2879.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2879.cpp
index 294c5e85..294c5e85 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2879.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2879.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2886.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2886.cpp
index 0474c710..0474c710 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2886.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2886.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2890.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2890.cpp
index cea47724..cea47724 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2890.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2890.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2902.cpp
index ae10d5a9..ae10d5a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2902.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2902.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2907.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2907.cpp
index 9d42a72d..9d42a72d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2907.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2907.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2910.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2910.cpp
index 82c2bec9..82c2bec9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2910.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2910.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2914.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2914.cpp
index c2cd8b59..c2cd8b59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2914.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2914.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2921.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2921.cpp
index 43e19e96..43e19e96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2921.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2921.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2930.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2930.cpp
index 9b130982..9b130982 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2930.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2930.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2942.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2942.cpp
index e5bc781f..e5bc781f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2942.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2942.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2949.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2949.cpp
index d37d7ac3..d37d7ac3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2949.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2949.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2957.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2957.cpp
index abb52b72..abb52b72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2957.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2957.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2971.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2971.cpp
index 52e7a253..52e7a253 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_2971.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_2971.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3010.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3010.cpp
index b546e7be..b546e7be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3010.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3010.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3018.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3018.cpp
index ddbb473e..ddbb473e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3018.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3018.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3025.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3025.cpp
index 9e64526e..9e64526e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3025.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3025.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3034.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3034.cpp
index b91f431d..b91f431d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3034.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3034.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3040.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3040.cpp
index fe9aed25..fe9aed25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3040.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3040.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3044.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3044.cpp
index 739b1305..739b1305 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3044.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3044.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3048.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3048.cpp
index 678d6ce4..678d6ce4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3048.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3048.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3052.cpp
index cb468be3..cb468be3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3052.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3052.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3054-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3054-2.cpp
index 77d0d337..77d0d337 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3054-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3054-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3054.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3054.cpp
index 2d8b38d0..2d8b38d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3054.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3054.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3055-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3055-a.cpp
index 85c9b7e8..85c9b7e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3055-a.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3055-a.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3055.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3055.cpp
index 4d66bbf3..4d66bbf3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3055.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3055.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3058.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3058.cpp
index f94e88e7..f94e88e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3058.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3058.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3061_0nl.cpp
index 2a76b5a3..2a76b5a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3061_0nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3061_0nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3061_1nl.cpp
index fd369e24..fd369e24 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3061_1nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3061_1nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3061_2nl.cpp
index 25906e08..25906e08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3061_2nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3061_2nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3080.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3080.cpp
index 75c6072b..75c6072b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3080.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3080.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3097.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3097.cpp
index 3959e85a..3959e85a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3097.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3097.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3113.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3113.cpp
index 63090f4a..63090f4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3113.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3113.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3164.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3164.cpp
index 79fd6508..79fd6508 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3164.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3164.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3176.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3176.cpp
index 2384027d..2384027d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3176.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3176.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3197.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3197.h
index f1ba44b5..f1ba44b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3197.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3197.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3198.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3198.cpp
index 8dd234b7..8dd234b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3198.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3198.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3203.cpp
index 47b37eee..47b37eee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3203.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3203.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3205.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3205.cpp
index 99767289..99767289 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3205.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3205.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3220.cpp
new file mode 100644
index 00000000..ba42b013
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3220.cpp
@@ -0,0 +1,6 @@
+int *   b;
+auto Func2(Model    *      model) -> Color                  *  *    const;
+auto Func2(Model   *   model) -> Color   *   *        const {
+        return nullptr;
+}
+int    *    Funcf(Model   *   model, int   *  *);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3236.cpp
new file mode 100644
index 00000000..ec79686e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3236.cpp
@@ -0,0 +1,20 @@
+/* multi boolean */
+if (va1 < 0 || va2 > 0)
+{
+}
+
+
+/* single condition */
+if (auto val = getValue(); condition(val))
+{
+}
+
+/* multi boolean expression with existing parentheses */
+if (auto val = getValue(); (val < 0) || (val > 0))
+{
+}
+
+/* multi boolean expression without existing parentheses */
+if (auto val = getValue(); val < 0 || val > 0)
+{
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3237.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3237.cpp
index 17e84d9c..17e84d9c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3237.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3237.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3252.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3252.cpp
index b435f4e2..b435f4e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3252.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3252.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3283.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3283.cpp
index 9357b3b3..9357b3b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3283.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3283.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3284.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3284.cpp
index cea9091e..cea9091e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3284.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3284.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3294.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3294.cpp
index e1bf0e87..e1bf0e87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3294.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3294.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3309.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3309.cpp
index d6dd1dac..d6dd1dac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3309.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3309.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3316.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3316.cpp
index ee644d21..ee644d21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3316.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3316.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3321.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3321.h
index 8e74beb2..8e74beb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3321.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3321.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3357.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3357.cpp
index f94d17fe..f94d17fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3357.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3357.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3409.cpp
index ac6e64bf..ac6e64bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3409.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3409.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3413.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3413.cpp
index 80ec8cbc..80ec8cbc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3413.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3413.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3422.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3422.cpp
index 015d93f4..015d93f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3422.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3422.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3428.cpp
index e4f45a1c..e4f45a1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3446.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3446.cpp
index 6332b0ad..6332b0ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3446.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3446.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3448.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3448.cpp
index 8dc80497..8dc80497 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3448.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3448.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3505.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3505.cpp
index bb9bcee5..bb9bcee5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3505.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3505.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3513-0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3513-0.cpp
index 51f07966..51f07966 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3513-0.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3513-0.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3513-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3513-1.cpp
index 020cc496..020cc496 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3513-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3513-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3536.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3536.cpp
index d068dd96..d068dd96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3536.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3536.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3538.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3538.cpp
index b965cb12..b965cb12 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3538.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3538.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3546.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3546.cpp
index 617e849f..617e849f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3546.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3546.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3550.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3550.cpp
index bf43f50e..bf43f50e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3550.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3550.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3552.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3552.cpp
index f3baae42..f3baae42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3552.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3552.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3558.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3558.cpp
index 561821ee..561821ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3558.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3558.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3570.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3570.h
index 363447e7..363447e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3570.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3570.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3576.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3576.h
index 9f668b6d..9f668b6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3576.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3576.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3604.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3604.cpp
index a96b3437..a96b3437 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3604.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3604.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3614.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3614.cpp
new file mode 100644
index 00000000..3129de2e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3614.cpp
@@ -0,0 +1,2 @@
+//bla
+//lint {...}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3691.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3691.h
index fb1ec761..fb1ec761 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3691.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3691.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3710.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3710.cpp
index 4c31fe90..4c31fe90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3710.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3710.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3761.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3761.cpp
index b3f8cbb5..b3f8cbb5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3761.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3761.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3785.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3785.cpp
index 90d4b28c..90d4b28c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3785.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3785.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3786.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3786.cpp
index ea830d4a..ea830d4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3786.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3786.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3863.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3863.cpp
index 4163ee8e..4163ee8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3863.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3863.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3863_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3863_2.cpp
index f91c6547..f91c6547 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3863_2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3863_2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3863_3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3863_3.cpp
index f2885f39..f2885f39 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_3863_3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3863_3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3865.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3865.cpp
new file mode 100644
index 00000000..8e444b2a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3865.cpp
@@ -0,0 +1,33 @@
+MOCK_METHOD(bool, isThat, (const std::string& name), (override));

+MOCK_METHOD(bool, isThat, (std::string& name), (override));

+MOCK_METHOD(bool, isThat, std::string& name, (override));

+MOCK_METHOD(bool, isThat, const std::string& name, (override));

+MyFunction(const std::string& some_value);

+MOCK_METHOD(void, isThat, (Callback const&), (override));

+

+class MyClass

+{

+	constexpr explicit MyClass(MyClass*& a) noexcept;

+};

+

+SomeClass::SomeClass(unsigned& counter, MyOtherType& lock)

+    : thisThing(counter)

+    , thatThing(lock)

+{

+}

+

+template<typename T = unsigned>

+struct TemplatedClass

+{

+    TemplatedClass(T& thing) {}

+};

+

+MyThing* MyClass::my_function()

+{

+    return &_theirThing;

+}

+

+// Shouldn't change

+EXPECT_EQ(static_cast<int>(MyEnumm::Last & MyEnumm::MyValue));

+#define SOME_MACRO(type, sss) if(n & type) { if(!k.doofer()) { k += "| "; } k += sss; }

+#define SOME_OTHER_MACRO(ttt, sss) (&ttt, &sss)

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3914.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3914.cpp
new file mode 100644
index 00000000..c51c4955
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3914.cpp
@@ -0,0 +1,8 @@
+void foo()
+{
+desc->add_options()
+    ("help,h", "produce help message")
+    ("version,v", "print the version number")
+    ("include-path,I", value< vector<string> >(), "include path")
+    ("input-file,i", value<string>(), "input file");
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3915.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3915.cpp
new file mode 100644
index 00000000..51c63928
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3915.cpp
@@ -0,0 +1,9 @@
+void
+foo(Foo const & f)
+{
+    auto bar = Bar(f);
+    if (bar.something) {
+        assert(bar.something_else == 1);
+    }
+}
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3916.cpp
new file mode 100644
index 00000000..40944d8b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3916.cpp
@@ -0,0 +1,29 @@
+#include <string>
+
+using TEnglishString = std::string;
+
+class CComCommandInfo
+{
+public:
+    CComCommandInfo( TEnglishString, TEnglishString );
+};
+
+template< typename T >
+class CGenericCommandEx
+{
+public:
+    CGenericCommandEx( T );
+};
+
+
+template< typename T >
+void Test( TEnglishString commandName_, TEnglishString commandDescription_, T functor_ )
+{
+    CComCommandInfo cmdInfo( std::forward< TEnglishString >( commandName_ ),
+                             std::forward< TEnglishString >( commandDescription_ ) );
+
+    auto* pCommand =
+        new CGenericCommandEx(
+            std::forward< decltype( functor_ ) >( functor_ ) ); // <--- Note the extra spaces added here
+}
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3919.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3919.cpp
new file mode 100644
index 00000000..611ce2e1
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3919.cpp
@@ -0,0 +1,5 @@
+void Test
+{
+    //<-- Here we want a space after //
+    DoSomething();   //-V612 : warning #612 disabled.
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3920.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3920.cpp
new file mode 100644
index 00000000..440fb5cf
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3920.cpp
@@ -0,0 +1,4 @@
+std::string StrGet()
+{
+    return IsConnected() ? "Connected" : {};
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3965-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3965-2.cpp
new file mode 100644
index 00000000..864979bb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3965-2.cpp
@@ -0,0 +1,7 @@
+void Win::check(QString id)
+{
+    if(names.contains(id + QString("_tst")) or names.contains(id + QString("_prd"))) {
+        true;
+    }
+    return;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3965.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3965.cpp
new file mode 100644
index 00000000..2205a5a5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3965.cpp
@@ -0,0 +1,4 @@
+void Win::fill()
+{
+    product->addItem(product.name + "%1");
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3967.cc b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3967.cc
new file mode 100644
index 00000000..84b393a2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3967.cc
@@ -0,0 +1,4 @@
+std::ostream& xx::operator<<(std::ostream& os, xx::Exception const& ex)
+{
+    return os;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3980.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3980.cpp
new file mode 100644
index 00000000..89d43dfe
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3980.cpp
@@ -0,0 +1,5 @@
+int a = 4I8;
+int b = 4I16;
+int c = 4I32;
+int d = 4I64;
+int e = 4I128;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3983.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3983.cpp
new file mode 100644
index 00000000..3e479f25
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3983.cpp
@@ -0,0 +1,9 @@
+#include <iostream>
+struct s {int i;};
+
+int main()
+{
+	struct s x;
+	x.i = 5;
+	std::cout << x.i << std::endl;
+}	// main
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3996.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3996.cpp
new file mode 100644
index 00000000..d2b4479f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_3996.cpp
@@ -0,0 +1,25 @@
+#include <iostream>
+
+class OtherClass
+{
+public:
+	int i;
+	OtherClass(): i(5) {}
+	OtherClass* self() {return this;}
+};
+
+class MyClass
+{
+public:
+	OtherClass x;
+	int getI();
+};
+
+int MyClass::getI() {
+	return this->x.self()->i;
+}
+
+int main() {
+	MyClass c;
+	std::cout << c.getI() << std::endl;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4023.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4023.cpp
new file mode 100644
index 00000000..609e499f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4023.cpp
@@ -0,0 +1,20 @@
+class foo {
+public:
+    bool var;
+ 
+    foo(bool x) { var = x; }
+ 
+    bool get()
+    {
+        return var;
+    }
+};
+
+
+int main() {
+    foo f(false);
+
+    const int b = true ? 2 : 3;
+
+    const int a = !f.get() ? 2 : 3;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4026.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4026.cpp
new file mode 100644
index 00000000..c0169c73
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4026.cpp
@@ -0,0 +1,50 @@
+class foo {
+public:
+    int var;
+ 
+    foo(int x) { var = x; }
+};
+
+int main() 
+{
+    int a = 2;
+    a++;
+
+    foo f(3);
+    f.var++;
+}
+
+InternalFunctionImp::InternalFunctionImp(ExecState *exec)
+  : ObjectImp(static_cast<FunctionPrototypeImp*>(exec->interpreter()->builtinFunctionPrototype().imp()))
+{
+  for (int z=0; z<count; z++)
+  {
+    TQString hlName = KateFactory::self()->schemaManager()->list().operator[](z);
+
+    if (names.contains(hlName) < 1)
+    {
+      names << hlName;
+      popupMenu()->insertItem ( hlName, this, TQT_SLOT(setSchema(int)), 0,  z+1);
+    }
+  }
+
+  struct sockaddr_in *sin1 = (sockaddr_in *) s1.address();
+  struct sockaddr_in *sin2 = (sockaddr_in *) s2.address();
+
+  if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
+  {
+     tqWarning("[dcopserver] Corrupt data!");
+     printf("[dcopserver] bytesLeft: %d, len: %d", bytesLeft, len);
+     return result;
+  }
+  result.TQByteArray::resize( (uint)len );
+
+	if (pbar->isVisible() && pbar->isEnabled() &&
+		pbar->progress() != pbar->totalSteps())
+	{
+		++iter.data();
+		if (iter.data() == 28)
+			iter.data() = 0;
+		iter.key()->update();
+	}
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4027.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4027.cpp
new file mode 100644
index 00000000..bd9a32d4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4027.cpp
@@ -0,0 +1 @@
+#define KK2 27F30
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4036.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4036.cpp
new file mode 100644
index 00000000..ceaa5312
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4036.cpp
@@ -0,0 +1,3 @@
+struct a {
+    bool b : 1;
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4042.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4042.cpp
new file mode 100644
index 00000000..3e5f01c2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4042.cpp
@@ -0,0 +1,6 @@
+   union Data {
+      int val1;
+      long val2;
+      Data( ) noexcept(false )
+         : val1( 1 ) { }
+   };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4080.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4080.cpp
new file mode 100644
index 00000000..178612c4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4080.cpp
@@ -0,0 +1,6 @@
+auto foo() -> char;
+int*x;
+int*y;
+int reset();
+int*X;
+int*Y;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4094.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4094.cpp
new file mode 100644
index 00000000..2eb624d0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4094.cpp
@@ -0,0 +1,2 @@
+auto lambda1 = []( int x   ){};
+auto lambda2 = [](){};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4132.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4132.cpp
new file mode 100644
index 00000000..256db54c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4132.cpp
@@ -0,0 +1 @@
+using stdsize = typename _arch_helper< (int)sizeof(void*) >::sz_t;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4239.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4239.cpp
new file mode 100644
index 00000000..5bcbfe77
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_4239.cpp
@@ -0,0 +1,10 @@
+void f()
+{
+    int x;
+    int y;
+    y = x;
+    if ((y = x) != 0)
+        for (;;)
+            if (x)
+                return;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_750.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_750.cpp
index 461e79ac..461e79ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_750.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_750.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_931.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_931.cpp
index 90084874..90084874 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_931.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_931.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_995-do.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_995-do.cpp
index 05eca611..05eca611 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Issue_995-do.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Issue_995-do.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/NewLine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/NewLine.cpp
index 9c7f1ee9..9c7f1ee9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/NewLine.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/NewLine.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/NewLine0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/NewLine0.cpp
index 01e7cc97..01e7cc97 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/NewLine0.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/NewLine0.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp
index b0e13d6a..b0e13d6a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Q_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Q_2.cpp
index ee6239f9..ee6239f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Q_2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Q_2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Q_EMIT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Q_EMIT.cpp
index d3ef9396..d3ef9396 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Q_EMIT.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Q_EMIT.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Q_FOREACH.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Q_FOREACH.cpp
index 37156618..37156618 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Q_FOREACH.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Q_FOREACH.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Q_FOREVER.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Q_FOREVER.cpp
index a0fb07d5..a0fb07d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Q_FOREVER.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Q_FOREVER.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp
index 5a4c8e7d..5a4c8e7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/STUCK_macro-difficulties.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/STUCK_macro-difficulties.cpp
index ea1c724e..ea1c724e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/STUCK_macro-difficulties.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/STUCK_macro-difficulties.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Timestamp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Timestamp.h
index 60dc3791..60dc3791 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/Timestamp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/Timestamp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-10496.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-10496.cpp
index 3228cf2a..3228cf2a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-10496.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-10496.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-12046.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-12046.cpp
index 9cc7b13f..9cc7b13f 100755..100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-12046.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-12046.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1288.cpp
index 38ded76c..38ded76c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1288.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1288.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1334.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1334.cpp
index 278cd1a2..278cd1a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1334.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1334.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1335.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1335.cpp
index 2f3ad2a2..2f3ad2a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1335.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1335.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1337.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1337.cpp
index 59635c19..59635c19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1337.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1337.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1339.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1339.cpp
index 255db223..255db223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1339.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1339.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1340.cpp
index 2f743294..2f743294 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1340.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1340.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1344.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1344.cpp
index c898df76..c898df76 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1344.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1344.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1346.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1346.cpp
index 0261a306..0261a306 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1346.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1346.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1347.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1347.cpp
index ac2184f0..ac2184f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1347.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1347.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1350.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1350.cpp
index 7353e915..7353e915 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1350.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1350.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1356.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1356.cpp
index 8a1aab54..8a1aab54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1356.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1356.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1358.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1358.cpp
index 770bf0c1..770bf0c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1358.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1358.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-16283.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-16283.cpp
index 7f042642..7f042642 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-16283.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-16283.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-18439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-18439.cpp
index 0c40e831..0c40e831 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-18439.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-18439.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-18777.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-18777.cpp
index 0f177fdc..0f177fdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-18777.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-18777.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1980.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1980.cpp
index 97940716..97940716 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1980.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1980.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1981.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1981.cpp
index a20f4c43..a20f4c43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1981.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1981.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1983.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1983.cpp
index e7d9de6d..e7d9de6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-1983.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-1983.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-19894.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-19894.cpp
index ef5fe7cf..ef5fe7cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-19894.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-19894.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-2049.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-2049.cpp
index 7c64f76a..7c64f76a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-2049.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-2049.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21506.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-21506.cpp
index a8c5f2df..a8c5f2df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21506.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-21506.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-21509.cpp
index bde48ee7..bde48ee7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21509.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-21509.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21510.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-21510.cpp
index ea406fbe..ea406fbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21510.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-21510.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21727.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-21727.cpp
index 991d2631..991d2631 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21727.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-21727.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21728.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-21728.cpp
index 658fba68..658fba68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21728.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-21728.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21729.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-21729.cpp
index 4b8d1d59..4b8d1d59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-21729.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-21729.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-2650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-2650.cpp
index b9ced773..b9ced773 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-2650.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-2650.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-2680.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-2680.cpp
index b6aa5bd7..b6aa5bd7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-2680.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-2680.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-2683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-2683.cpp
index 5da60d3f..5da60d3f 100755..100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-2683.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-2683.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-29935.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-29935.cpp
index a6cf3fc5..a6cf3fc5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-29935.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-29935.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-30088.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-30088.cpp
index 1fd5c1fe..1fd5c1fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-30088.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-30088.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-30628.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-30628.cpp
index ffa60026..ffa60026 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-30628.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-30628.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-32657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-32657.cpp
index 9151231a..9151231a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-32657.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-32657.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-38381.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-38381.cpp
index 701b55b2..701b55b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-38381.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-38381.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-64325.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-64325.cpp
index c4005d7c..c4005d7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-64325.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-64325.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-9650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-9650.cpp
index f6dba01b..f6dba01b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/UNI-9650.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/UNI-9650.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/al.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/al.cpp
index 3c232dec..3c232dec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/al.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/al.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align-330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align-330.cpp
index 0ba91720..0ba91720 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align-330.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align-330.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align-assign-mixed.cpp
index 2e55d59d..2e55d59d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align-assign-mixed.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align-assign-mixed.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align-star-amp-pos.cpp
index 29a7a23a..29a7a23a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align-star-amp-pos.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align-star-amp-pos.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_across_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_across_braces.cpp
index f47f0c80..f47f0c80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_across_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_across_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_assign_func_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_assign_func_proto.cpp
index 0c816099..0c816099 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_assign_func_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_assign_func_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_asterisk_after_type_cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_asterisk_after_type_cast.cpp
index 4b325b1e..4b325b1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_asterisk_after_type_cast.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_asterisk_after_type_cast.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_class-constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_class-constr.cpp
index 2be3c8e8..2be3c8e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_class-constr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_class-constr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_class.cpp
index d47e77bb..d47e77bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_class.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_class.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_constr.cpp
index 1a22f6d9..1a22f6d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_constr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_constr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_continuation_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_continuation_left_shift.cpp
index c0c066b8..c0c066b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_continuation_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_continuation_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_default_after_override.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_default_after_override.cpp
index de21686c..de21686c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_default_after_override.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_default_after_override.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_fcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_fcall.cpp
index c27ed9d1..c27ed9d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_fcall.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_fcall.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_func_params.cpp
index a90155fd..a90155fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_func_proto_thresh.cpp
index df6b4dca..df6b4dca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_func_proto_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_func_proto_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_func_proto_thresh2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_func_proto_thresh2.cpp
index b0960a11..b0960a11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_func_proto_thresh2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_func_proto_thresh2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_left_shift.cpp
index 3cf7a744..3cf7a744 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_left_shift2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_left_shift2.cpp
index c90ae71f..c90ae71f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_left_shift2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_left_shift2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_right_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_right_comment.cpp
index 43a2a70f..43a2a70f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_right_comment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_right_comment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_var_def_thresh.cpp
index 3942f227..3942f227 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/align_var_def_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/align_var_def_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/alt_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/alt_tokens.cpp
index fcaf1392..fcaf1392 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/alt_tokens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/alt_tokens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/anonymous_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/anonymous_enum.cpp
index 0cf8426d..0cf8426d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/anonymous_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/anonymous_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/arith_vs_byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/arith_vs_byref.cpp
index f459fdcc..f459fdcc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/arith_vs_byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/arith_vs_byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/asm_block_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/asm_block_pp.cpp
index e6816d9a..e6816d9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/asm_block_pp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/asm_block_pp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/attribute_specifier_seqs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/attribute_specifier_seqs.cpp
index 744b3404..744b3404 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/attribute_specifier_seqs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/attribute_specifier_seqs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/av.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/av.h
index 7a90197c..7a90197c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/av.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/av.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bit-colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bit-colon.cpp
index b593255b..b593255b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bit-colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bit-colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bom.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bom.cpp
index 7ee7e7e6..7ee7e7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bom.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bom.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bool.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bool.cpp
index 30d4cb29..30d4cb29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bool.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bool.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/brace_brace_init_lst.cpp
index 2a5254f0..2a5254f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/brace_init_stdint_macros.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/brace_init_stdint_macros.cpp
index 59eb8897..59eb8897 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/brace_init_stdint_macros.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/brace_init_stdint_macros.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/braced_init_list.cpp
index e245f34c..e245f34c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/braced_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/braced_init_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/braced_init_template_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/braced_init_template_decltype.cpp
index bfd5ef86..bfd5ef86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/braced_init_template_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/braced_init_template_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/braces_align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/braces_align.cpp
index ca99edc6..ca99edc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/braces_align.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/braces_align.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/braces_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/braces_empty.cpp
index 583c7fa1..583c7fa1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/braces_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/braces_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1001.cpp
index b0ce9a06..b0ce9a06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1001.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1001.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1002.cpp
index 713018e4..713018e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1002.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1002.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1003.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1003.cpp
index 7495b93d..7495b93d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1003.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1003.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1004.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1004.cpp
index 3287be1c..3287be1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1004.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1004.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1005.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1005.cpp
index 01a457d0..01a457d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1005.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1005.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1020.cpp
index ec80e915..ec80e915 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1020.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1020.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1027.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1027.cpp
index 5ccafd2b..5ccafd2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1027.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1027.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1032.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1032.cpp
index 80078efe..80078efe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1032.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1032.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1068.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1068.cpp
index 74fbc8e7..74fbc8e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1068.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1068.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1108.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1108.cpp
index 573a9810..573a9810 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1108.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1108.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1112.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1112.cpp
index e6537641..e6537641 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1112.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1112.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1127.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1127.cpp
index 9ee98743..9ee98743 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1127.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1127.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1134.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1134.cpp
index 369b70f1..369b70f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1134.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1134.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1139.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1139.cpp
index 82210d96..82210d96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1139.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1139.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1158.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1158.cpp
index e92da160..e92da160 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1158.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1158.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1160.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1160.cpp
index 8dc7a9d1..8dc7a9d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1160.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1160.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1161.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1161.cpp
index 535c3be7..535c3be7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1161.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1161.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1169.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1169.cpp
index aa56008a..aa56008a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1169.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1169.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1170.cpp
index 35dd772f..35dd772f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1170.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1170.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1235.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1235.cpp
index b9ff78a1..b9ff78a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1235.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1235.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1236.cpp
index 8acaaed2..8acaaed2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1236.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1236.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1249.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1249.cpp
index 975dc82c..975dc82c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1249.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1249.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1288.cpp
index 94444cf9..94444cf9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1288.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1288.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1289.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1289.cpp
index 42663477..42663477 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1289.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1289.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1296.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1296.cpp
index e2cd65fb..e2cd65fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1296.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1296.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1315.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1315.cpp
index 080c9233..080c9233 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1315.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1315.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1321.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1321.cpp
index c381f91c..c381f91c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1321.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1321.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1324.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1324.cpp
index 5df154f3..5df154f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1324.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1324.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1338.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1338.cpp
index 04b4cd8a..04b4cd8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1338.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1338.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1340.cpp
index 680d6d51..680d6d51 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1340.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1340.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1346.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1346.h
index 21fe1c44..21fe1c44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1346.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1346.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1349.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1349.cpp
index aa1938e8..aa1938e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1349.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1349.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1395.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1395.cpp
index 00694ce9..00694ce9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1395.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1395.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1402.cpp
index 9b001a44..9b001a44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1402.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1402.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1403.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1403.cpp
index 71f67f75..71f67f75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1403.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1403.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1432.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1432.cpp
index 575a21c8..575a21c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1432.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1432.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1439.cpp
index d560522b..d560522b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1439.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1439.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1452.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1452.cpp
index d7fcf753..d7fcf753 100755..100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1452.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1452.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1462.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1462.cpp
index 5170b9a9..5170b9a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1462.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1462.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1607.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1607.cpp
index 9e4e47d3..9e4e47d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1607.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1607.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1649.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1649.cpp
index 4ab5eea8..4ab5eea8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1649.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1649.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1689.cpp
index 795bb572..795bb572 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1689.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1689.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1691.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1691.cpp
index 2d5d1204..2d5d1204 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1691.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1691.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1717.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1717.cpp
index a1adcf5f..a1adcf5f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1717.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1717.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1758-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1758-f.cpp
index b324fbda..b324fbda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1758-f.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1758-f.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1758.cpp
index b0f35107..b0f35107 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1758.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1758.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1854.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1854.cpp
index 29cc2774..29cc2774 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1854.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1854.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1862.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1862.cpp
index 78958bb1..78958bb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_1862.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_1862.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2285.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_2285.cpp
index 14a85090..14a85090 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2285.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_2285.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_2322.cpp
index f9768c40..f9768c40 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2322.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_2322.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2371.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_2371.cpp
index 26444ad3..26444ad3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2371.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_2371.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_2402.cpp
index 92731c19..92731c19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2402.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_2402.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2433_1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_2433_1.cpp
index d19718f5..d19718f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2433_1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_2433_1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2433_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_2433_2.cpp
index 9da12944..9da12944 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_2433_2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_2433_2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_33056.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_33056.cpp
index 1339ede1..1339ede1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_33056.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_33056.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_472.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_472.cpp
index 753d9519..753d9519 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_472.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_472.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_481.cpp
index 03c4a828..03c4a828 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_481.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_481.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_484.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_484.cpp
index 4c582e86..4c582e86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_484.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_484.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_485.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_485.cpp
index 4865da64..4865da64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_485.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_485.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_488.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_488.cpp
index 382beced..382beced 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_488.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_488.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_495.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_495.cpp
index f356c302..f356c302 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_495.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_495.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_612.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_612.cpp
index 38253f15..38253f15 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_612.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_612.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_631.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_631.cpp
index e110d383..e110d383 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_631.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_631.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_633.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_633.cpp
index 5b672b47..5b672b47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_633.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_633.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_634.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_634.cpp
index febbf7b3..febbf7b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_634.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_634.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_643.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_643.cpp
index 55e3e309..55e3e309 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_643.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_643.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_651.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_651.cpp
index b36e182a..b36e182a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_651.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_651.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_653.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_653.cpp
index 1bf853d6..1bf853d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_653.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_653.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_654.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_654.cpp
index 8baaeb1c..8baaeb1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_654.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_654.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_657.cpp
index 230b96b3..230b96b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_657.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_657.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_662.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_662.cpp
index f8b0f8a8..f8b0f8a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_662.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_662.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_663.cpp
index 869320c0..869320c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_663.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_663.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_664.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_664.cpp
index 148201b0..148201b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_664.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_664.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_666.cpp
index 00adec83..00adec83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_666.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_666.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_670.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_670.cpp
index e9229a8e..e9229a8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_670.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_670.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_670.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_670.h
index ea503b10..ea503b10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_670.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_670.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_671.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_671.h
index 8ff7bfca..8ff7bfca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_671.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_671.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_858.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_858.cpp
index 512d2e45..512d2e45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_858.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_858.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_902.cpp
index eb51f587..eb51f587 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_902.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_902.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_1000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_1000.cpp
index 06da6b3e..06da6b3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_1000.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_1000.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_197.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_197.cpp
index e86698fd..e86698fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_197.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_197.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_322.cpp
index bc7e687f..bc7e687f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_322.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_322.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_323.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_323.cpp
index ea141156..ea141156 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_323.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_323.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_359.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_359.cpp
index 294e3afb..294e3afb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_359.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_359.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_405.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_405.cpp
index eda9b0dd..eda9b0dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_405.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_405.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_409.cpp
index b3b51488..b3b51488 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_409.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_409.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_411.cpp
index 647570f2..647570f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_411.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_411.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_478.cpp
index 5a16eccc..5a16eccc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_478.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_478.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_481.cpp
index 2a4e6b8f..2a4e6b8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_481.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_481.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_503.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_503.cpp
index 3c5951a8..3c5951a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_503.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_503.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_512.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_512.cpp
index 3b4de434..3b4de434 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_512.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_512.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_525.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_525.cpp
index d0773475..d0773475 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_525.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_525.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_552.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_552.cpp
index 5a0704de..5a0704de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_552.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_552.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_568.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_568.cpp
index 68729907..68729907 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_568.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_568.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_575.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_575.cpp
index 3ef21f1f..3ef21f1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_575.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_575.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_596.cpp
index 88f77e34..88f77e34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_596.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_596.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_646.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_646.cpp
index f89b6416..f89b6416 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_646.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_646.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_663.cpp
index 2a473bc7..2a473bc7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_663.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_663.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_666.cpp
index 00adec83..00adec83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_666.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_666.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_682.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_682.h
index 8f1fc31f..8f1fc31f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_682.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_682.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_687.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_687.cpp
index 0f9e8155..0f9e8155 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_687.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_687.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_752.cpp
index b0b77452..b0b77452 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_753.cpp
index 07cc31fe..07cc31fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_753.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_753.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_793.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_793.cpp
index 6777bfa5..6777bfa5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_793.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_793.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_825.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_825.cpp
index d3f89db7..d3f89db7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_825.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_825.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_889.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_889.cpp
index 270f0695..270f0695 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_889.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_889.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_928.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_928.cpp
index d2878656..d2878656 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_928.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_928.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_938.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_938.h
index b13997a6..b13997a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_938.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_938.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_999.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_999.cpp
index 2a5d64a4..2a5d64a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_999.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_999.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_width.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_width.cpp
index 08f7888e..08f7888e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/bug_i_width.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/bug_i_width.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/byref-2.cpp
index 0ef61cde..0ef61cde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/byref-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/byref-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/byref-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/byref-3.cpp
index 28da2d74..28da2d74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/byref-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/byref-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/byref-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/byref-4.cpp
index 0fe49c7b..0fe49c7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/byref-4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/byref-4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/byref.cpp
index 85669bc6..85669bc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/call_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/call_brace_init_lst.cpp
index 11f92ee3..11f92ee3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/call_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/call_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/case-brace-remove.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/case-brace-remove.cpp
index 421ff658..421ff658 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/case-brace-remove.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/case-brace-remove.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cast.cpp
index 7b29b06f..7b29b06f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cast.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cast.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/casts.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/casts.cpp
index 0bcab0d9..0bcab0d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/casts.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/casts.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/class-addr.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/class-addr.h
index ea539afa..ea539afa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/class-addr.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/class-addr.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/class-implementation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/class-implementation.cpp
index 05eb69cf..05eb69cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/class-implementation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/class-implementation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/class-init.cpp
index af06e31a..af06e31a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/class.h
index 0048604d..0048604d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt-cpp-cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cmt-cpp-cont.cpp
index 8885e36b..8885e36b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt-cpp-cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cmt-cpp-cont.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt-reflow.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cmt-reflow.cpp
index adb5a6ab..adb5a6ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt-reflow.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cmt-reflow.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_backslash_eol.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cmt_backslash_eol.cpp
index e56aec25..e56aec25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_backslash_eol.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cmt_backslash_eol.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp
index 32ff32d3..32ff32d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cmt_indent.cpp
index 542a0fd2..542a0fd2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cmt_indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_indent_pp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cmt_indent_pp.h
index 25253f09..25253f09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_indent_pp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cmt_indent_pp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_insert.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cmt_insert.cpp
index a5ae87d5..a5ae87d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_insert.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cmt_insert.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_right.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cmt_right.cpp
index 121ea044..121ea044 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_right.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cmt_right.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_trailing_single_line_c_to_cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cmt_trailing_single_line_c_to_cpp.cpp
index 1f3cff49..1f3cff49 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cmt_trailing_single_line_c_to_cpp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cmt_trailing_single_line_c_to_cpp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/comma.cpp
index e101145a..e101145a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/comma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/comma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/comment-align-multiline.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/comment-align-multiline.cpp
index 73dab5ec..73dab5ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/comment-align-multiline.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/comment-align-multiline.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/comment-align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/comment-align.cpp
index 403bf773..403bf773 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/comment-align.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/comment-align.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/const_throw.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/const_throw.cpp
index f0d1773d..f0d1773d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/const_throw.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/const_throw.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/constr_colon.cpp
index 6c0706e5..6c0706e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/constructor.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/constructor.cpp
index 46abf36a..46abf36a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/constructor.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/constructor.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/conversion_operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/conversion_operator.cpp
index 27b52dac..27b52dac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/conversion_operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/conversion_operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cout.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cout.cpp
index c3c9366d..c3c9366d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cout.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cout.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cpp17.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cpp17.cpp
index ba463284..ba463284 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cpp17.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cpp17.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cpp_move.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cpp_move.cpp
index cec9beb8..cec9beb8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/cpp_move.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/cpp_move.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/ctor-var.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/ctor-var.cpp
index 2551d8bd..2551d8bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/ctor-var.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/ctor-var.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/custom-open-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/custom-open-2.cpp
index 422cb1bf..422cb1bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/custom-open-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/custom-open-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/custom-open.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/custom-open.cpp
index 1544fd74..1544fd74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/custom-open.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/custom-open.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/define-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/define-indentation.cpp
index 69e924ee..69e924ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/define-indentation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/define-indentation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/delete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/delete.cpp
index fff916e3..fff916e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/delete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/delete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/deref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/deref.cpp
index abfb70c7..abfb70c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/deref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/deref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/digraph.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/digraph.cpp
index 57cfddf5..57cfddf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/digraph.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/digraph.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/disable_macro.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/disable_macro.cpp
index cb9fc307..cb9fc307 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/disable_macro.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/disable_macro.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/dont-detab-strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/dont-detab-strings.cpp
index fd622c3c..fd622c3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/dont-detab-strings.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/dont-detab-strings.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/dont-process-defines.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/dont-process-defines.cpp
index a0a58f85..a0a58f85 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/dont-process-defines.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/dont-process-defines.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/eat_blanks_after_codewidth.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/eat_blanks_after_codewidth.cpp
index 8753aee2..8753aee2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/eat_blanks_after_codewidth.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/eat_blanks_after_codewidth.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/eigen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/eigen.cpp
index 4e228311..4e228311 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/eigen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/eigen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/enum.cpp
index 88b229a0..fd85660b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/enum.cpp
@@ -151,8 +151,8 @@ enum log_sev_t
    LINDENTAG = 88, /* indent again */
    LNFD      = 89, /* newline-function-def */
    LJDBI     = 90, /* Java Double Brace Init */
-   LSETPAR   = 91, /* Chunk::SetParentTypeReal() */
-   LSETTYP   = 92, /* Chunk::SetTypeReal() */
+   LSETPAR   = 91, /* Chunk::SetParentType() */
+   LSETTYP   = 92, /* Chunk::SetType() */
    LSETFLG   = 93, /* set_chunk_flags() */
    LNLFUNCT  = 94, /* newlines before function */
    LCHUNK    = 95, /* Add or del chunk */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/enum_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/enum_class.h
index 2ba9933f..2ba9933f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/enum_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/enum_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/enum_comma.h
index 42ce2c53..42ce2c53 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/enum_comment_wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/enum_comment_wrap.cpp
index 736e6718..736e6718 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/enum_comment_wrap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/enum_comment_wrap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/enum_shr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/enum_shr.cpp
index 8bde6273..8bde6273 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/enum_shr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/enum_shr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/exception.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/exception.cpp
index 7f29676e..7f29676e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/exception.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/exception.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/extern_c.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/extern_c.h
index e4943e50..e4943e50 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/extern_c.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/extern_c.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/extern_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/extern_func.cpp
index 24e90a37..24e90a37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/extern_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/extern_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/first_len_minimum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/first_len_minimum.cpp
index 0a729f01..0a729f01 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/first_len_minimum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/first_len_minimum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/fix_for_relational_operators.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/fix_for_relational_operators.cpp
index 0014b110..0014b110 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/fix_for_relational_operators.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/fix_for_relational_operators.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/for_auto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/for_auto.cpp
index c62548f8..c62548f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/for_auto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/for_auto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/for_long.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/for_long.cpp
index 7685f614..7685f614 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/for_long.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/for_long.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/for_loop_head.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/for_loop_head.cpp
index cbfacf62..cbfacf62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/for_loop_head.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/for_loop_head.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/foreach.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/foreach.cpp
index cfbe7963..cfbe7963 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/foreach.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/foreach.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/friends.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/friends.cpp
index 1b073b45..1b073b45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/friends.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/friends.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/func-param-wrap-oc.mm
index 16f98ce9..16f98ce9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func-param-wrap-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/func-param-wrap-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/func_call.cpp
index 6467560f..6467560f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/func_call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_call_chain.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/func_call_chain.cpp
index 7e2f3931..7e2f3931 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_call_chain.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/func_call_chain.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/func_class.cpp
index 64a11509..64a11509 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_class.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/func_class.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/func_class.h
index 168b0b3d..168b0b3d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/func_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/func_param.cpp
index 24b187c1..24b187c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/func_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_param_indent_leading_comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/func_param_indent_leading_comma.cpp
index 8c62d49b..8c62d49b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/func_param_indent_leading_comma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/func_param_indent_leading_comma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/function-def.cpp
index 7f5e05c4..7f5e05c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/functype_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/functype_param.cpp
index 5d2ff4fe..5d2ff4fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/functype_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/functype_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/gcc_case_ellipsis.cpp
index 1b0b4088..1b0b4088 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/gcc_case_ellipsis.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/gcc_case_ellipsis.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/gh555.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/gh555.cpp
index feb059d3..feb059d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/gh555.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/gh555.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/goto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/goto.cpp
index 0f50d182..0f50d182 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/goto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/goto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1082.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1082.cpp
index 06680c0e..06680c0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1082.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1082.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1165.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1165.cpp
index c3123b59..c3123b59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1165.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1165.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1181.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1181.cpp
index 1a959d34..1a959d34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1181.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1181.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1207.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1207.cpp
index 0c8e1c92..0c8e1c92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1207.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1207.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1218.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1218.cpp
index d4d05106..d4d05106 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1218.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1218.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1464.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1464.cpp
index 179ecd5e..179ecd5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1464.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1464.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1466.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1466.cpp
index fe704d2a..fe704d2a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1466.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1466.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1509.cpp
index d3e79ff6..d3e79ff6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1509.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1509.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1509_bug_1112_correction.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1509_bug_1112_correction.cpp
index 1470d613..1470d613 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1509_bug_1112_correction.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1509_bug_1112_correction.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1516.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1516.cpp
index e1fe3f77..e1fe3f77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1516.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1516.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1536.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1536.cpp
index 2c33ec58..2c33ec58 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1536.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1536.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1565.cpp
index 5cb66589..5cb66589 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1565.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1565.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1617.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1617.cpp
index 1901e3db..1901e3db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1617.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1617.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1768.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1768.cpp
index 7fa82285..7fa82285 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i1768.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i1768.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i2033.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i2033.cpp
index fd27cf6d..fd27cf6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i2033.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i2033.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i2116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i2116.cpp
index 8011f572..8011f572 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i2116.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i2116.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i683.cpp
index 4d95c7ce..4d95c7ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/i683.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/i683.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/if-constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/if-constexpr.cpp
index 76f37f92..76f37f92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/if-constexpr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/if-constexpr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/if_chain_braces.cpp
index 693efc63..693efc63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/if_chain_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/if_constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/if_constexpr.cpp
index 032f74ec..032f74ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/if_constexpr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/if_constexpr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/ifcomment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/ifcomment.cpp
index 52f508f6..52f508f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/ifcomment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/ifcomment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent-c.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent-c.cpp
index 5b4ace27..369548e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent-c.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent-c.cpp
@@ -190,20 +190,20 @@ static void indent_pse_push(struct parse_frame& frm, Chunk *pc)
    static int ref = 0;
 
    /* check the stack depth */
-   if (frm.pse_tos < (int)ARRAY_SIZE(frm.pse))
+   if (frm.m_parenStack_tos < (int)ARRAY_SIZE(frm.m_parenStack))
    {
       /* Bump up the index and initialize it */
       frm.pse_tos++;
-      memset(&frm.pse[frm.pse_tos], 0, sizeof(frm.pse[frm.pse_tos]));
+      memset(&frm.m_parenStack[frm.m_parenStack_tos], 0, sizeof(frm.m_parenStack[frm.m_parenStack_tos]));
 
       LOG_FMT(LINDPSE, "%4d] OPEN  [%d,%s] level=%d\n",
               pc->GetOrigLine(), frm.pse_tos, get_token_name(pc->GetType()), pc->GetLevel());
 
-      frm.pse[frm.pse_tos].type       = pc->GetType();
-      frm.pse[frm.pse_tos].level      = pc->GetLevel();
-      frm.pse[frm.pse_tos].open_line  = pc->GetOrigLine();
-      frm.pse[frm.pse_tos].ref        = ++ref;
-      frm.pse[frm.pse_tos].in_preproc = (pc->GetFlags() & PCF_IN_PREPROC) != 0;
+      frm.m_parenStack[frm.m_parenStack_tos].type       = pc->GetType();
+      frm.m_parenStack[frm.m_parenStack_tos].level      = pc->GetLevel();
+      frm.m_parenStack[frm.m_parenStack_tos].open_line  = pc->GetOrigLine();
+      frm.m_parenStack[frm.m_parenStack_tos].ref        = ++ref;
+      frm.m_parenStack[frm.m_parenStack_tos].in_preproc = (pc->GetFlags() & PCF_IN_PREPROC) != 0;
    }
 }
 
@@ -223,17 +223,17 @@ static void indent_pse_pop(struct parse_frame& frm, Chunk *pc)
       {
          LOG_FMT(LINDPSE, "%4d] CLOSE [%d,%s] on %s, started on line %d, level=%d/%d\n",
                  pc->GetOrigLine(), frm.pse_tos,
-                 get_token_name(frm.pse[frm.pse_tos].type),
+                 get_token_name(frm.m_parenStack[frm.m_parenStack_tos].type),
                  get_token_name(pc->GetType()),
-                 frm.pse[frm.pse_tos].open_line,
-                 frm.pse[frm.pse_tos].level,
+                 frm.m_parenStack[frm.m_parenStack_tos].open_line,
+                 frm.m_parenStack[frm.m_parenStack_tos].level,
                  pc->GetLevel());
       }
       else
       {
          LOG_FMT(LINDPSE, " EOF] CLOSE [%d,%s], started on line %d\n",
-                 frm.pse_tos, get_token_name(frm.pse[frm.pse_tos].type),
-                 frm.pse[frm.pse_tos].open_line);
+                 frm.m_parenStack_tos, get_token_name(frm.m_parenStack[frm.m_parenStack_tos].type),
+                 frm.m_parenStack[frm.m_parenStack_tos].open_line);
       }
       frm.pse_tos--;
    }
@@ -292,9 +292,9 @@ void indent_text(void)
    memset(&frm, 0, sizeof(frm));
 
    /* dummy top-level entry */
-   frm.pse[0].indent     = 1;
-   frm.pse[0].indent_tmp = 1;
-   frm.pse[0].type       = CT_EOF;
+   frm.m_parenStack[0].indent     = 1;
+   frm.m_parenStack[0].indent_tmp = 1;
+   frm.m_parenStack[0].type       = CT_EOF;
 
    pc = Chunk::GetHead();
    while (pc != NULL)
@@ -311,7 +311,7 @@ void indent_text(void)
       /* Clean up after a #define */
       if (!in_preproc)
       {
-         while ((frm.pse_tos > 0) && frm.pse[frm.pse_tos].in_preproc)
+         while ((frm.m_parenStack_tos > 0) && frm.m_parenStack[frm.m_parenStack_tos].in_preproc)
          {
             indent_pse_pop(frm, pc);
          }
@@ -326,8 +326,8 @@ void indent_text(void)
             frm.level++;
             indent_pse_push(frm, pc);
 
-            frm.pse[frm.pse_tos].indent     = 1 + indent_size;
-            frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
+            frm.m_parenStack[frm.m_parenStack_tos].indent     = 1 + indent_size;
+            frm.m_parenStack[frm.m_parenStack_tos].indent_tmp = frm.m_parenStack[frm.m_parenStack_tos].indent;
          }
       }
 
@@ -354,16 +354,16 @@ void indent_text(void)
          if (!pc->IsNewline() &&
              !pc->IsComment() &&
              ((pc->GetFlags() & PCF_IN_PREPROC) == 0) &&
-             (frm.pse[frm.pse_tos].level > pc->GetLevel()))
+             (frm.m_parenStack[frm.m_parenStack_tos].level > pc->GetLevel()))
          {
             indent_pse_pop(frm, pc);
          }
 
-         if (frm.pse[frm.pse_tos].level == pc->GetLevel())
+         if (frm.m_parenStack[frm.m_parenStack_tos].level == pc->GetLevel())
          {
             /* process virtual braces closes (no text output) */
             if ((pc->GetType() == CT_VBRACE_CLOSE) &&
-                (frm.pse[frm.pse_tos].type == CT_VBRACE_OPEN))
+                (frm.m_parenStack[frm.m_parenStack_tos].type == CT_VBRACE_OPEN))
             {
                indent_pse_pop(frm, pc);
                frm.level--;
@@ -371,7 +371,7 @@ void indent_text(void)
             }
 
             /* End any assign operations with a semicolon on the same level */
-            if ((frm.pse[frm.pse_tos].type == CT_ASSIGN) &&
+            if ((frm.m_parenStack[frm.m_parenStack_tos].type == CT_ASSIGN) &&
                 (pc->IsSemicolon() ||
                  (pc->GetType() == CT_COMMA) ||
                  (pc->GetType() == CT_BRACE_OPEN)))
@@ -380,7 +380,7 @@ void indent_text(void)
             }
 
             /* End any CPP class colon crap */
-            if ((frm.pse[frm.pse_tos].type == CT_CLASS_COLON) &&
+            if ((frm.m_parenStack[frm.m_parenStack_tos].type == CT_CLASS_COLON) &&
                 ((pc->GetType() == CT_BRACE_OPEN) ||
                  pc->IsSemicolon()))
             {
@@ -388,7 +388,7 @@ void indent_text(void)
             }
 
             /* a case is ended with another case or a close brace */
-            if ((frm.pse[frm.pse_tos].type == CT_CASE) &&
+            if ((frm.m_parenStack[frm.m_parenStack_tos].type == CT_CASE) &&
                 ((pc->GetType() == CT_BRACE_CLOSE) ||
                  (pc->GetType() == CT_CASE)))
             {
@@ -396,14 +396,14 @@ void indent_text(void)
             }
 
             /* a return is ended with a semicolon */
-            if ((frm.pse[frm.pse_tos].type == CT_RETURN) &&
+            if ((frm.m_parenStack[frm.m_parenStack_tos].type == CT_RETURN) &&
                 pc->IsSemicolon())
             {
                indent_pse_pop(frm, pc);
             }
 
             /* Close out parens and squares */
-            if ((frm.pse[frm.pse_tos].type == (pc->GetType() - 1)) &&
+            if ((frm.m_parenStack[frm.m_parenStack_tos].type == (pc->GetType() - 1)) &&
                 ((pc->GetType() == CT_PAREN_CLOSE) ||
                  (pc->GetType() == CT_SPAREN_CLOSE) ||
                  (pc->GetType() == CT_FPAREN_CLOSE) ||
@@ -411,22 +411,22 @@ void indent_text(void)
                  (pc->GetType() == CT_ANGLE_CLOSE)))
             {
                indent_pse_pop(frm, pc);
-               frm.paren_count--;
+               frm.SetParenCount(frm.GetParenCount() - 1);
             }
          }
       } while (old_pse_tos > frm.pse_tos);
 
       /* Grab a copy of the current indent */
-      indent_column = frm.pse[frm.pse_tos].indent_tmp;
+      indent_column = frm.m_parenStack[frm.m_parenStack_tos].indent_tmp;
 
       if (!pc->IsNewline() && !pc->IsComment())
       {
          LOG_FMT(LINDPC, " -=[ %.*s ]=- top=%d %s %d/%d\n",
                  pc->len, pc->GetStr(),
                  frm.pse_tos,
-                 get_token_name(frm.pse[frm.pse_tos].type),
-                 frm.pse[frm.pse_tos].indent_tmp,
-                 frm.pse[frm.pse_tos].indent);
+                 get_token_name(frm.m_parenStack[frm.m_parenStack_tos].type),
+                 frm.m_parenStack[frm.m_parenStack_tos].indent_tmp,
+                 frm.m_parenStack[frm.m_parenStack_tos].indent);
       }
 
       /**
@@ -447,7 +447,7 @@ void indent_text(void)
 
       if (pc->GetType() == CT_BRACE_CLOSE)
       {
-         if (frm.pse[frm.pse_tos].type == CT_BRACE_OPEN)
+         if (frm.m_parenStack[frm.m_parenStack_tos].type == CT_BRACE_OPEN)
          {
             indent_pse_pop(frm, pc);
             frm.level--;
@@ -456,7 +456,7 @@ void indent_text(void)
             if (!cpd.settings[UO_indent_braces].b &&
                 (parent_token_indent == 0))
             {
-               indent_column = frm.pse[frm.pse_tos].indent_tmp;
+               indent_column = frm.m_parenStack[frm.m_parenStack_tos].indent_tmp;
             }
 
             if ((pc->GetParentType() == CT_IF) ||
@@ -476,26 +476,26 @@ void indent_text(void)
          frm.level++;
          indent_pse_push(frm, pc);
 
-         frm.pse[frm.pse_tos].indent     = frm.pse[frm.pse_tos - 1].indent + indent_size;
-         frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
+         frm.m_parenStack[frm.m_parenStack_tos].indent     = frm.m_parenStack[frm.m_parenStack_tos - 1].indent + indent_size;
+         frm.m_parenStack[frm.m_parenStack_tos].indent_tmp = frm.m_parenStack[frm.m_parenStack_tos].indent;
 
          /* Always indent on virtual braces */
-         indent_column = frm.pse[frm.pse_tos].indent_tmp;
+         indent_column = frm.m_parenStack[frm.m_parenStack_tos].indent_tmp;
       }
       else if (pc->GetType() == CT_BRACE_OPEN)
       {
          frm.level++;
          indent_pse_push(frm, pc);
 
-         if (frm.paren_count != 0)
+         if (frm.GetParenCount() != 0)
          {
             /* We are inside ({ ... }) -- indent one tab from the paren */
-            frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent_tmp + indent_size;
+            frm.m_parenStack[frm.m_parenStack_tos].indent = frm.m_parenStack[frm.m_parenStack_tos - 1].indent_tmp + indent_size;
          }
          else
          {
             /* Use the prev indent level + indent_size. */
-            frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent + indent_size;
+            frm.m_parenStack[frm.m_parenStack_tos].indent = frm.m_parenStack[frm.m_parenStack_tos - 1].indent + indent_size;
 
             /* If this brace is part of a statement, bump it out by indent_brace */
             if ((pc->GetParentType() == CT_IF) ||
@@ -508,33 +508,33 @@ void indent_text(void)
             {
                if (parent_token_indent != 0)
                {
-                  frm.pse[frm.pse_tos].indent += parent_token_indent - indent_size;
+                  frm.m_parenStack[frm.m_parenStack_tos].indent += parent_token_indent - indent_size;
                }
                else
                {
-                  frm.pse[frm.pse_tos].indent += cpd.settings[UO_indent_brace].n;
+                  frm.m_parenStack[frm.m_parenStack_tos].indent += cpd.settings[UO_indent_brace].n;
                   indent_column += cpd.settings[UO_indent_brace].n;
                }
             }
             else if (pc->GetParentType() == CT_CASE)
             {
                /* The indent_case_brace setting affects the parent CT_CASE */
-               frm.pse[frm.pse_tos].indent_tmp += cpd.settings[UO_indent_case_brace].n;
-               frm.pse[frm.pse_tos].indent     += cpd.settings[UO_indent_case_brace].n;
+               frm.m_parenStack[frm.m_parenStack_tos].indent_tmp += cpd.settings[UO_indent_case_brace].n;
+               frm.m_parenStack[frm.m_parenStack_tos].indent     += cpd.settings[UO_indent_case_brace].n;
             }
             else if ((pc->GetParentType() == CT_CLASS) && !cpd.settings[UO_indent_class].b)
             {
-               frm.pse[frm.pse_tos].indent -= indent_size;
+               frm.m_parenStack[frm.m_parenStack_tos].indent -= indent_size;
             }
             else if ((pc->GetParentType() == CT_NAMESPACE) && !cpd.settings[UO_indent_namespace].b)
             {
-               frm.pse[frm.pse_tos].indent -= indent_size;
+               frm.m_parenStack[frm.m_parenStack_tos].indent -= indent_size;
             }
          }
 
          if ((pc->GetFlags() & PCF_DONT_INDENT) != 0)
          {
-            frm.pse[frm.pse_tos].indent = pc->GetColumn();
+            frm.m_parenStack[frm.m_parenStack_tos].indent = pc->GetColumn();
             indent_column = pc->GetColumn();
          }
          else
@@ -549,31 +549,31 @@ void indent_text(void)
             next = pc->GetNextNcNnl();
             if (!pc->IsNewlineBetween(next))
             {
-               frm.pse[frm.pse_tos].indent = next->GetColumn();
+               frm.m_parenStack[frm.m_parenStack_tos].indent = next->GetColumn();
             }
-            frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
-            frm.pse[frm.pse_tos].open_line  = pc->GetOrigLine();
+            frm.m_parenStack[frm.m_parenStack_tos].indent_tmp = frm.m_parenStack[frm.m_parenStack_tos].indent;
+            frm.m_parenStack[frm.m_parenStack_tos].open_line  = pc->GetOrigLine();
 
             /* Update the indent_column if needed */
             if (cpd.settings[UO_indent_braces].n ||
                 (parent_token_indent != 0))
             {
-               indent_column = frm.pse[frm.pse_tos].indent_tmp;
+               indent_column = frm.m_parenStack[frm.m_parenStack_tos].indent_tmp;
             }
          }
       }
       else if (pc->GetType() == CT_CASE)
       {
          /* Start a case - indent UO_indent_switch_case from the switch level */
-         tmp = frm.pse[frm.pse_tos].indent + cpd.settings[UO_indent_switch_case].n;
+         tmp = frm.m_parenStack[frm.m_parenStack_tos].indent + cpd.settings[UO_indent_switch_case].n;
 
          indent_pse_push(frm, pc);
 
-         frm.pse[frm.pse_tos].indent     = tmp;
-         frm.pse[frm.pse_tos].indent_tmp = tmp - indent_size;
+         frm.m_parenStack[frm.m_parenStack_tos].indent     = tmp;
+         frm.m_parenStack[frm.m_parenStack_tos].indent_tmp = tmp - indent_size;
 
          /* Always set on case statements */
-         indent_column = frm.pse[frm.pse_tos].indent_tmp;
+         indent_column = frm.m_parenStack[frm.m_parenStack_tos].indent_tmp;
       }
       else if (pc->GetType() == CT_LABEL)
       {
@@ -584,7 +584,7 @@ void indent_text(void)
          }
          else
          {
-            indent_column = frm.pse[frm.pse_tos].indent +
+            indent_column = frm.m_parenStack[frm.m_parenStack_tos].indent +
                             cpd.settings[UO_indent_label].n;
          }
       }
@@ -592,17 +592,17 @@ void indent_text(void)
       {
          /* just indent one level */
          indent_pse_push(frm, pc);
-         frm.pse[frm.pse_tos].indent     = frm.pse[frm.pse_tos - 1].indent_tmp + indent_size;
-         frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
+         frm.m_parenStack[frm.m_parenStack_tos].indent     = frm.m_parenStack[frm.m_parenStack_tos - 1].indent_tmp + indent_size;
+         frm.m_parenStack[frm.m_parenStack_tos].indent_tmp = frm.m_parenStack[frm.m_parenStack_tos].indent;
 
-         indent_column = frm.pse[frm.pse_tos].indent_tmp;
+         indent_column = frm.m_parenStack[frm.m_parenStack_tos].indent_tmp;
 
          if (cpd.settings[UO_indent_class_colon].b)
          {
             prev = pc->GetPrev();
             if (prev->IsNewline())
             {
-               frm.pse[frm.pse_tos].indent += 2;
+               frm.m_parenStack[frm.m_parenStack_tos].indent += 2;
                /* don't change indent of current line */
             }
          }
@@ -615,13 +615,13 @@ void indent_text(void)
       {
          /* Open parens and squares - never update indent_column */
          indent_pse_push(frm, pc);
-         frm.pse[frm.pse_tos].indent = pc->GetColumn() + pc->len;
+         frm.m_parenStack[frm.m_parenStack_tos].indent = pc->GetColumn() + pc->len;
 
          if (cpd.settings[UO_indent_func_call_param].b &&
              (pc->GetType() == CT_FPAREN_OPEN) &&
              (pc->GetParentType() == CT_FUNC_CALL))
          {
-            frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent + indent_size;
+            frm.m_parenStack[frm.m_parenStack_tos].indent = frm.m_parenStack[frm.m_parenStack_tos - 1].indent + indent_size;
          }
 
          if ((chunk_is_str(pc, "(", 1) && !cpd.settings[UO_indent_paren_nl].b) ||
@@ -631,15 +631,15 @@ void indent_text(void)
             if (next->IsNewline())
             {
                int sub = 1;
-               if (frm.pse[frm.pse_tos - 1].type == CT_ASSIGN)
+               if (frm.m_parenStack[frm.m_parenStack_tos - 1].type == CT_ASSIGN)
                {
                   sub = 2;
                }
-               frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - sub].indent + indent_size;
+               frm.m_parenStack[frm.m_parenStack_tos].indent = frm.m_parenStack[frm.m_parenStack_tos - sub].indent + indent_size;
             }
          }
-         frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
-         frm.paren_count++;
+         frm.m_parenStack[frm.m_parenStack_tos].indent_tmp = frm.m_parenStack[frm.m_parenStack_tos].indent;
+         frm.SetParenCount(frm.GetParenCount() + 1);
       }
       else if (pc->GetType() == CT_ASSIGN)
       {
@@ -654,13 +654,13 @@ void indent_text(void)
             indent_pse_push(frm, pc);
             if (next->IsNewline())
             {
-               frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent_tmp + indent_size;
+               frm.m_parenStack[frm.m_parenStack_tos].indent = frm.m_parenStack[frm.m_parenStack_tos - 1].indent_tmp + indent_size;
             }
             else
             {
-               frm.pse[frm.pse_tos].indent = pc->GetColumn() + pc->len + 1;
+               frm.m_parenStack[frm.m_parenStack_tos].indent = pc->GetColumn() + pc->len + 1;
             }
-            frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
+            frm.m_parenStack[frm.m_parenStack_tos].indent_tmp = frm.m_parenStack[frm.m_parenStack_tos].indent;
          }
       }
       else if (pc->GetType() == CT_RETURN)
@@ -669,8 +669,8 @@ void indent_text(void)
          if (pc->GetLevel() == pc->GetBraceLevel())
          {
             indent_pse_push(frm, pc);
-            frm.pse[frm.pse_tos].indent     = frm.pse[frm.pse_tos - 1].indent + pc->len + 1;
-            frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos - 1].indent;
+            frm.m_parenStack[frm.m_parenStack_tos].indent     = frm.m_parenStack[frm.m_parenStack_tos - 1].indent + pc->len + 1;
+            frm.m_parenStack[frm.m_parenStack_tos].indent_tmp = frm.m_parenStack[frm.m_parenStack_tos - 1].indent;
          }
       }
       else if (chunk_is_str(pc, "<<", 2))
@@ -735,8 +735,8 @@ void indent_text(void)
          else if (pc->IsComment())
          {
             LOG_FMT(LINDENT, "%s: %d] comment => %d\n",
-                    __func__, pc->GetOrigLine(), frm.pse[frm.pse_tos].indent_tmp);
-            indent_comment(pc, frm.pse[frm.pse_tos].indent_tmp);
+                    __func__, pc->GetOrigLine(), frm.m_parenStack[frm.m_parenStack_tos].indent_tmp);
+            indent_comment(pc, frm.m_parenStack[frm.m_parenStack_tos].indent_tmp);
          }
          else if (pc->GetType() == CT_PREPROC)
          {
@@ -778,16 +778,16 @@ void indent_text(void)
           (pc->GetType() == CT_COMMENT_MULTI) ||
           (pc->GetType() == CT_COMMENT_CPP))
       {
-         frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent;
+         frm.m_parenStack[frm.m_parenStack_tos].indent_tmp = frm.m_parenStack[frm.m_parenStack_tos].indent;
 
          /**
           * Handle the case of a multi-line #define w/o anything on the
           * first line (indent_tmp will be 1 or 0)
           */
          if ((pc->GetType() == CT_NL_CONT) &&
-             (frm.pse[frm.pse_tos].indent_tmp <= indent_size))
+             (frm.m_parenStack[frm.m_parenStack_tos].indent_tmp <= indent_size))
          {
-            frm.pse[frm.pse_tos].indent_tmp = indent_size + 1;
+            frm.m_parenStack[frm.m_parenStack_tos].indent_tmp = indent_size + 1;
          }
 
          /* Get ready to indent the next item */
@@ -802,7 +802,7 @@ void indent_text(void)
    }
 
    /* Throw out any stuff inside a preprocessor - no need to warn */
-   while ((frm.pse_tos > 0) && frm.pse[frm.pse_tos].in_preproc)
+   while ((frm.m_parenStack_tos > 0) && frm.m_parenStack[frm.m_parenStack_tos].in_preproc)
    {
       indent_pse_pop(frm, pc);
    }
@@ -810,8 +810,8 @@ void indent_text(void)
    for (idx = 1; idx <= frm.pse_tos; idx++)
    {
       LOG_FMT(LWARN, "%s:%d Unmatched %s\n",
-              cpd.filename, frm.pse[idx].open_line,
-              get_token_name(frm.pse[idx].type));
+              cpd.filename, frm.m_parenStack[idx].open_line,
+              get_token_name(frm.m_parenStack[idx].type));
       cpd.error_count++;
    }
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent-inside-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent-inside-ternary-operator.cpp
index 40cdad92..40cdad92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent-inside-ternary-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent-inside-ternary-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent-misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent-misc.cpp
index 78a924f4..78a924f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent-misc.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent-misc.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent-off.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent-off.cpp
index 79a7ad65..79a7ad65 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent-off.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent-off.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent.cpp
index a8c4a514..a8c4a514 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_braces_no.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_braces_no.h
index c5b39b37..c5b39b37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_braces_no.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_braces_no.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_comma_brace_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_comma_brace_func.cpp
index d417b5be..d417b5be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_comma_brace_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_comma_brace_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_comma_brace_glob.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_comma_brace_glob.cpp
index 8e01afc6..8e01afc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_comma_brace_glob.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_comma_brace_glob.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_comment_align_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_comment_align_thresh.cpp
index 7ddfacbf..7ddfacbf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_comment_align_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_comment_align_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_ctor_init.cpp
index d9fefe24..d9fefe24 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_ctor_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_ctor_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_ctor_members_twice.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_ctor_members_twice.cpp
index 4fbd1b4c..4fbd1b4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_ctor_members_twice.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_ctor_members_twice.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_func_alias_prototype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_func_alias_prototype.cpp
index 7bd2afdc..7bd2afdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_func_alias_prototype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_func_alias_prototype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_namespace.h
index f97bd324..f97bd324 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_namespace2.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_namespace2.h
index db2ce47d..db2ce47d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_namespace2.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_namespace2.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_namespace_inner_only.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_namespace_inner_only.h
index a73879a7..a73879a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_namespace_inner_only.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_namespace_inner_only.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_namespace_single_indent.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_namespace_single_indent.h
index 97d57444..97d57444 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_namespace_single_indent.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_namespace_single_indent.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_off_after_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_off_after_return.cpp
index 58e24797..58e24797 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_off_after_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_off_after_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_param.cpp
index c194141b..c194141b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_paren_after_func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_paren_after_func_call.cpp
index 96b38fba..96b38fba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_paren_after_func_call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_paren_after_func_call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_paren_after_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_paren_after_func_decl.cpp
index ff8c3e44..ff8c3e44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_paren_after_func_decl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_paren_after_func_decl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_paren_after_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_paren_after_func_def.cpp
index 703e0422..703e0422 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_paren_after_func_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_paren_after_func_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_shift.cpp
index 54684fa7..54684fa7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_switch_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_switch_pp.cpp
index 1b76e218..1b76e218 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_switch_pp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_switch_pp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_ternary-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_ternary-1.cpp
index 7281a2e6..7281a2e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_ternary-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_ternary-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_var_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_var_def.cpp
index 394cfb63..394cfb63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_var_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_var_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_var_def_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_var_def_cont.cpp
index d273ae52..d273ae52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/indent_var_def_cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/indent_var_def_cont.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/init-list-call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/init-list-call.cpp
index 70451ac4..70451ac4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/init-list-call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/init-list-call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/init_align.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/init_align.h
index ff1dcc9b..ff1dcc9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/init_align.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/init_align.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/initlist_leading_commas.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/initlist_leading_commas.cpp
index 83188d77..83188d77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/initlist_leading_commas.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/initlist_leading_commas.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/interface-keyword-in-cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/interface-keyword-in-cpp.cpp
index bc039e18..bc039e18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/interface-keyword-in-cpp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/interface-keyword-in-cpp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_1752.cpp
index e3be4d50..e3be4d50 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_1752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1778.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_1778.cpp
index 4eea46e0..4eea46e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1778.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_1778.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1782.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_1782.cpp
index c12b83d0..c12b83d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1782.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_1782.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1804.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_1804.cpp
index 2923a4a2..2923a4a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1804.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_1804.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_1916.cpp
index 4c819605..4c819605 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1919.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_1919.cpp
index 187065d6..187065d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1919.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_1919.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1946.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_1946.cpp
index 9682da68..9682da68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1946.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_1946.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1985.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_1985.cpp
index 4e5685a1..4e5685a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_1985.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_1985.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_2000.cpp
index aa324f2e..aa324f2e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2000.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_2000.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_2001.cpp
index 39b9446d..39b9446d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2001.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_2001.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2124-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_2124-1.cpp
index 8c582cf9..8c582cf9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2124-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_2124-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2124-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_2124-2.cpp
index 8c582cf9..8c582cf9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2124-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_2124-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2209-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_2209-1.cpp
index a1ebb1a7..a1ebb1a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2209-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_2209-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2209-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_2209-2.cpp
index 5725d3d7..5725d3d7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2209-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_2209-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_2623.cpp
index 5834e4b3..5834e4b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_2623.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_2623.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_3105_1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_3105_1.cpp
new file mode 100644
index 00000000..a7d8cf8a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_3105_1.cpp
@@ -0,0 +1,10 @@
+int short_function_name()
+{
+        call_some_really_long_function.of_some_sort(some_long_parameter1, some_long_parameter2);
+
+ void *test_func =      library->symbol( TQString(TQString("test_%1").arg(module2.factoryName())).utf8() );
+
+    CHECK_COMPLETE_SIZE (iceConn, ICE_AuthNextPhase, length,
+                 	message->authDataLength + SIZEOF (iceAuthNextPhaseMsg), authData,
+	iceConn->connect_to_you ? IceFatalToConnection : IceFatalToProtocol);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_3105_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_3105_2.cpp
new file mode 100644
index 00000000..949e4fbe
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_3105_2.cpp
@@ -0,0 +1,107 @@
+struct KPluginSelectionWidget::KPluginSelectionWidgetPrivate
+{
+    KPluginSelectionWidgetPrivate( KPluginSelector * _kps,
+                                   const TQString & _cat,
+                                   TDEConfigGroup * _config )
+     : widgetstack( 0 )
+        , kps( _kps )
+        , config( _config )
+        , tooltip( 0 )
+        , catname( _cat )
+        , currentplugininfo( 0 )
+        , visible( true )
+        , currentchecked( false )
+        , changed( 0 )
+    {
+        moduleParentComponents.setAutoDelete( true );
+    }
+};
+
+KPasswordDialog::KPasswordDialog(Types type, bool enableKeep, int extraBttn,
+                                 TQWidget *parent, const char *name)
+    : KDialogBase(parent, name, true, "", Ok|Cancel|extraBttn,
+                  Ok, true), m_Keep(enableKeep? 1 : 0), m_Type(type), m_keepWarnLbl(0), d(new KPasswordDialogPrivate)
+{
+    d->iconName = "password";
+    init();
+
+        const TQString strengthBarWhatsThis(i18n("The password strength meter gives an indication of the security "
+                                                "of the password you have entered.  To improve the strength of "
+                                                "the password, try:\n"
+                                                " - using a longer password;\n"
+                                                " - using a mixture of upper- and lower-case letters;\n"
+                                                " - using numbers or symbols, such as #, as well as letters."));
+
+	  int retVal = KMessageBox::warningContinueCancel(this,
+		i18n(   "The password you have entered has a low strength. "
+			"To improve the strength of "
+			"the password, try:\n"
+			" - using a longer password;\n"
+			" - using a mixture of upper- and lower-case letters;\n"
+			" - using numbers or symbols as well as letters.\n"
+			"\n"
+			"Would you like to use this password anyway?"),
+		i18n("Low Password Strength"));
+}
+
+static const int POPUP_FLAGS = TQt::WStyle_Customize | TQt::WDestructiveClose | TQt::WX11BypassWM
+                             | TQt::WStyle_StaysOnTop | TQt::WStyle_Tool | TQt::WStyle_NoBorder;
+
+KPassivePopup::KPassivePopup( TQWidget *parent, const char *name, WFlags f )
+    : TQFrame( 0, name, (WFlags)(f ? (int)f : POPUP_FLAGS) ),
+      window( parent ? parent->winId() : 0L ), msgView( 0 ), topLayout( 0 ),
+      hideDelay( DEFAULT_POPUP_TIME ), hideTimer( new TQTimer( this, "hide_timer" ) ),
+      m_autoDelete( false )
+{
+    init( DEFAULT_POPUP_TYPE );
+
+    move( right ? d->anchor.x() - width() + 20 : ( d->anchor.x() < 11 ? 11 : d->anchor.x() - 20 ),
+          bottom ? d->anchor.y() - height() : ( d->anchor.y() < 11 ? 11 : d->anchor.y() ) );
+}
+
+TDEToggleAction *showMenubar( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *_name )
+{
+    TDEToggleAction *ret;
+    ret = new TDEToggleAction(i18n("Show &Menubar"), "showmenu", TDEStdAccel::shortcut(TDEStdAccel::ShowMenubar), recvr, slot,
+                            parent, _name ? _name : name(ShowMenubar));
+    ret->setWhatsThis( i18n( "Show Menubar<p>"
+                             "Shows the menubar again after it has been hidden" ) );
+    KGuiItem guiItem( i18n("Hide &Menubar"), 0 /*same icon*/, TQString::null,
+                      i18n( "Hide Menubar<p>"
+                            "Hide the menubar. You can usually get it back using the right mouse button inside the window itself." ) );
+    return ret;
+}
+
+KProgressBoxDialog::KProgressBoxDialog(TQWidget* parent, const char* name,
+                                 const TQString& caption, const TQString& text,
+                                 bool modal)
+    : KDialogBase(KDialogBase::Plain, caption, KDialogBase::Cancel,
+                  KDialogBase::Cancel, parent, name, modal),
+      mAutoClose(true),
+      mAutoReset(false),
+      mCancelled(false),
+      mAllowCancel(true),
+      mAllowTextEdit(false),
+      mShown(false),
+      mMinDuration(2000),
+      d(new KProgressBoxDialogPrivate)
+{
+    KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+}
+
+TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu()
+{
+   TDEPopupMenu *popup=new TDEPopupMenu(this, "PixmapRegionSelectorPopup");
+   popup->insertTitle(i18n("Image Operations"));
+   
+   TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right",
+                                0, TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()),
+                                TQT_TQOBJECT(popup), "rotateclockwise");
+   action->plug(popup);
+
+   action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left",
+                                0, TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()),
+                                TQT_TQOBJECT(popup), "rotatecounterclockwise");
+   action->plug(popup);
+   return popup;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_3116-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_3116-2.cpp
index 6e007772..6e007772 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_3116-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_3116-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_3116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_3116.cpp
index 96167df1..9a4a03d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_3116.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_3116.cpp
@@ -71,23 +71,23 @@ auto f = []
 };
 
 // Nested lambda within functions
-Func(
+FuncA(
     [] { return; },
     [] { return; }
 );
 
-Func([] { return; },
+FuncB([] { return; },
     [] { return; }
 );
 
-Func([] { return; },
+FuncC([] { return; },
     [] { return; }
 )();
 
-Func([] { return; },
+FuncD([] { return; },
     [] { return; })();
 
-Func([] { return; },
+FuncE([] { return; },
     [] { return; });
 
 A(
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_3330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_3330.cpp
index 37062480..37062480 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_3330.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_3330.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_3368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_3368.cpp
index 2158086c..2158086c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_3368.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_3368.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_3378.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_3378.cpp
index 319c3151..319c3151 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_3378.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_3378.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_523.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_523.cpp
index d203e398..d203e398 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_523.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_523.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_547_for_each.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_547_for_each.cpp
index cfbe7963..cfbe7963 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_547_for_each.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_547_for_each.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_564.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_564.cpp
index 0c289a8a..0c289a8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_564.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_564.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_574-i.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_574-i.cpp
index c7730a54..c7730a54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_574-i.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_574-i.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_574.cpp
index 96e910ca..96e910ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_624_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_624_angle.cpp
index 255db223..255db223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_624_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_624_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_633_typename.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_633_typename.cpp
index e99742ef..e99742ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_633_typename.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_633_typename.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_672.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_672.cpp
index 6d8dde90..6d8dde90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/issue_672.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/issue_672.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/kw_subst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/kw_subst.cpp
index e57868e2..e57868e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/kw_subst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/kw_subst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/kw_subst2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/kw_subst2.cpp
index d167cc1c..d167cc1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/kw_subst2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/kw_subst2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/lambda.cpp
index 7bc50606..7bc50606 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lambda2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/lambda2.cpp
index a4b8a8c6..a4b8a8c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lambda2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/lambda2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lambda_brace_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/lambda_brace_list.cpp
index da3db41f..da3db41f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lambda_brace_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/lambda_brace_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lambda_in_one_liner.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/lambda_in_one_liner.cpp
index c740c4bd..c740c4bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lambda_in_one_liner.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/lambda_in_one_liner.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lambda_selfcalling.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/lambda_selfcalling.cpp
index 543290fa..543290fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lambda_selfcalling.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/lambda_selfcalling.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lineEndings-Mac.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/lineEndings-Mac.cpp
index 608952c0..608952c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lineEndings-Mac.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/lineEndings-Mac.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lineEndings-Unix.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/lineEndings-Unix.cpp
index cdbf7653..cdbf7653 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lineEndings-Unix.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/lineEndings-Unix.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lineEndings-Win.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/lineEndings-Win.cpp
index 20fa083a..20fa083a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/lineEndings-Win.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/lineEndings-Win.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/long_br_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/long_br_cmt.cpp
index a7638876..a7638876 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/long_br_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/long_br_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/long_lines.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/long_lines.cpp
new file mode 100644
index 00000000..ee154e8b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/long_lines.cpp
@@ -0,0 +1,25 @@
+void main()
+{
+	if (true)
+	{
+		/* Output the coordinates of the icon */
+		snprintf(&ret[strlen(ret)], ret_max-strlen(ret), "\nx=\"0px\"\ny=\"0px\"\n");
+		snprintf(&ret[strlen(ret)], ret_max-strlen(ret), "width=\"%d\"\n", icon->icon_width);
+		snprintf(&ret[strlen(ret)], ret_max-strlen(ret), "height=\"%d\"\n", icon->icon_height);
+		snprintf(&ret[strlen(ret)], ret_max-strlen(ret), "viewBox=\"%lf %lf %lf %lf\"\n", icon->x, icon->y, icon->width, icon->height);
+
+		snprintf(&ret[strlen(ret)], ret_max-strlen(ret), icon->x, icon->y, bar("viewBox=\"%lf %lf %lf %lf\"\n", icon->width), icon->height);
+
+		snprintf(&ret[strlen(ret)], ret_max-strlen(ret), "viewBox=\"%lf %lf %lf %lf\"\n", icon->x, icon->y, icon->width, icon->height);
+		snprintf(&ret[strlen(ret)], ret_max-strlen(ret), "viewBox=\"%lf %lf %lf %lf\"\n", foo(icon->x, icon->y, icon->width), icon->height);
+		snprintf(&ret[strlen(ret)], ret_max-strlen(ret), icon->x, icon->y, bar("viewBox=\"%lf %lf %lf %lf\"\n", icon->width), icon->height);
+		snprintf(&ret[strlen(ret)], ret_max-foo(ret, par), icon->x, icon->y, bar("viewBox=\"%lf %lf %lf %lf\"\n", icon->width), icon->height);
+
+		create_a_reeeeeeeeeeeeeeeeeeeeeeeeeeeeally_long_identifier name(some_function(bar1 + bar2), bar3, bar4);
+		create_a_reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeally_long_identifier name(some_function(bar1 + bar2), bar3, bar4);
+
+		abc.def.ghi = call_some_other_really_long_function.of_some_sort_of_very_very_very_loooooooooong(some_long_parameter1, some_long_parameter2);
+	}
+}
+
+#define FOO(bar) create_a_really_long_identifier name(some_function(bar1 + bar2), bar3, bar4);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/long_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/long_namespace.cpp
index 89fe4435..89fe4435 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/long_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/long_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/macro_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/macro_spaces.cpp
index c27c6b5d..c27c6b5d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/macro_spaces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/macro_spaces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/misc.cpp
index 8a73b431..8a73b431 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/misc.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/misc2.cpp
index b6ce3078..b6ce3078 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/misc2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/misc3.cpp
index c7c10d6c..c7c10d6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/misc3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/misc4.cpp
index 725fa160..725fa160 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/misc4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc5.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/misc5.cpp
index 570a4a76..570a4a76 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc5.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/misc5.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc6.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/misc6.cpp
index 95cc0383..95cc0383 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/misc6.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/misc6.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/mod_remove_empty_return-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/mod_remove_empty_return-2.cpp
index eb949c45..eb949c45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/mod_remove_empty_return-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/mod_remove_empty_return-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/mod_remove_empty_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/mod_remove_empty_return.cpp
index ca3105da..ca3105da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/mod_remove_empty_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/mod_remove_empty_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/ms-style-ref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/ms-style-ref.cpp
index 213393b9..213393b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/ms-style-ref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/ms-style-ref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/multi_line.cpp
index df5f3a84..df5f3a84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/namespace_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/namespace_namespace.cpp
index cf6f921e..cf6f921e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/namespace_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/namespace_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/new_op.cpp
index 828215e8..828215e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/new_op.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/new_op.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl-class.h
index 128974b7..128974b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl-class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl-class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl-namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl-namespace.h
index a436fcb7..a436fcb7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl-namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl-namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_assign_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_assign_leave_one_liners.cpp
index cf3325f0..cf3325f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_assign_leave_one_liners.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_assign_leave_one_liners.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_before_after.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_before_after.h
index fb77edf1..fb77edf1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_before_after.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_before_after.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_before_brace_open_test.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_before_brace_open_test.cpp
index 6e3daf66..6e3daf66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_before_brace_open_test.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_before_brace_open_test.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_before_func_body_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_before_func_body_def.cpp
index c7cab4c7..c7cab4c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_before_func_body_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_before_func_body_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_before_struct_scoped_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_before_struct_scoped_enum.cpp
index f4065b20..f4065b20 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_before_struct_scoped_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_before_struct_scoped_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_before_struct_struct.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_before_struct_struct.cpp
index edac027c..edac027c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_before_struct_struct.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_before_struct_struct.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_brace_brace.cpp
index b698546a..b698546a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_brace_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_brace_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp
index 6250d752..6250d752 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp
index 6250d752..6250d752 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp
index 6250d752..6250d752 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp
index 6250d752..6250d752 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_for_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_for_leave_one_liners.cpp
index 382d2815..382d2815 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_for_leave_one_liners.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_for_leave_one_liners.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func-2.cpp
new file mode 100644
index 00000000..864a4277
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func-2.cpp
@@ -0,0 +1,32 @@
+class BSRRE1D_file : PhysicalFile
+{
+   int getFoo() { return(m_foo); }
+
+
+
+
+   void setFoo(int foo) { m_foo = foo; }
+   public BSRRE1D_file()
+   {
+       this.addFormatName("BSRRE1DF");
+   }
+private int m_foo;
+   public void xxx()
+   {
+       ahoj();
+   } // comment
+
+
+
+
+   public void yyy()
+   {
+       ahoj();
+   }
+
+   /* comment 2 */
+   public void xxx()
+   {
+       ahoj();
+   }
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func.cpp
index e27d7e55..e27d7e55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_call_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func_call_empty.cpp
index 6678ee18..6678ee18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_call_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func_call_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func_call_paren.cpp
index 309a65a9..309a65a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_call_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func_call_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_call_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func_call_paren_empty.cpp
index 6678ee18..6678ee18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_call_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func_call_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func_decl.cpp
index 91a7184f..91a7184f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_decl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func_decl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_def_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func_def_paren_empty.cpp
index f1ba8607..f1ba8607 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_def_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func_def_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func_paren_empty.cpp
index 19965aac..19965aac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_scope_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func_scope_name.cpp
index d221e974..d221e974 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_scope_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func_scope_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func_type_name.cpp
index 26e49663..26e49663 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_inside_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_inside_namespace.cpp
index 4bdcb394..4bdcb394 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_inside_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_inside_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_max_blank_in_func.cpp
index c87e6e68..c87e6e68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/nl_max_blank_in_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/nl_max_blank_in_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/noexcept.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/noexcept.cpp
index e6ea9116..e6ea9116 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/noexcept.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/noexcept.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/not_lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/not_lambda.cpp
index a9c65439..a9c65439 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/not_lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/not_lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/op_sym_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/op_sym_empty.cpp
index 4b79ca9e..4b79ca9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/op_sym_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/op_sym_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/operator.cpp
index 6f2a7f03..6f2a7f03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/operator_proto.cpp
index b14935ee..b14935ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/operator_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/operator_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/out-668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/out-668.cpp
index 0dac74c3..0dac74c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/out-668.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/out-668.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/output.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/output.cpp
index a770b7ca..a770b7ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/output.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/output.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/override_virtual.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/override_virtual.cpp
index 537454b1..537454b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/override_virtual.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/override_virtual.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/parameter-packs.cpp
index 6d734b1f..6d734b1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/patch_32.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/patch_32.cpp
index 8d9e222e..8d9e222e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/patch_32.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/patch_32.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pos_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/pos_assign.cpp
index af55296b..af55296b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pos_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/pos_assign.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pos_bool_in_template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/pos_bool_in_template.h
index ef01470e..ef01470e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pos_bool_in_template.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/pos_bool_in_template.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/pos_shift.cpp
index 4d55a541..4d55a541 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pos_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/pos_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp-define-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/pp-define-indent.cpp
index 8ec5657f..8ec5657f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp-define-indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/pp-define-indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp-pragma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/pp-pragma.cpp
index 75b3c46d..75b3c46d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp-pragma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/pp-pragma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp_indent_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/pp_indent_brace.cpp
index 1e02efcb..1e02efcb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp_indent_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/pp_indent_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp_indent_case.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/pp_indent_case.cpp
index da61641a..da61641a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp_indent_case.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/pp_indent_case.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp_indent_extern.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/pp_indent_extern.cpp
index 76cfc4bf..76cfc4bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp_indent_extern.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/pp_indent_extern.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp_indent_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/pp_indent_func_def.cpp
index 7a0bcecf..7a0bcecf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp_indent_func_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/pp_indent_func_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp_multi_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/pp_multi_comment.cpp
index 98418c46..98418c46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/pp_multi_comment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/pp_multi_comment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/proto-wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/proto-wrap.cpp
index 35e8bea3..35e8bea3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/proto-wrap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/proto-wrap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/ptr-star.cpp
index ff0ab369..ff0ab369 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/qt-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/qt-1.cpp
index e318c1aa..e318c1aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/qt-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/qt-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/qtargs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/qtargs.cpp
index 5037d792..5037d792 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/qtargs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/qtargs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/region.cpp
index 28447084..28447084 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/return_braced_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/return_braced_init.cpp
index cf86baeb..cf86baeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/return_braced_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/return_braced_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/return_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/return_init_list.cpp
index f58dfee5..f58dfee5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/return_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/return_init_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/return_remove.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/return_remove.cpp
new file mode 100644
index 00000000..41eafbc9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/return_remove.cpp
@@ -0,0 +1,9 @@
+void
+function(skip_it)
+{
+    if (skip_it)
+        return;
+
+    do_it();
+    return;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/returns.cpp
index 1085bd72..1085bd72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sef.cpp
index add2fc4a..add2fc4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/semi.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/semi.cpp
index 9f7832cd..9f7832cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/semi.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/semi.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/semicolons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/semicolons.cpp
index 52796f75..52796f75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/semicolons.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/semicolons.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf.2886991.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sf.2886991.cpp
index 97dfe0cf..97dfe0cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf.2886991.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sf.2886991.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf.3266678.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sf.3266678.cpp
index 69f877ed..69f877ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf.3266678.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sf.3266678.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf.3315874.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sf.3315874.h
index 58921bc5..58921bc5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf.3315874.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sf.3315874.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf557.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sf557.cpp
index c7ba93cc..c7ba93cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf557.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sf557.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf562.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sf562.cpp
index 15ee8e79..15ee8e79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf562.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sf562.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf567.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sf567.cpp
index 0c1d5fc9..0c1d5fc9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf567.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sf567.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sf574.cpp
index 3f5a98d4..3f5a98d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sf574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf583.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sf583.cpp
index 8eba4d1e..8eba4d1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf583.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sf583.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf593.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sf593.cpp
index 1fc0ded8..1fc0ded8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sf593.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sf593.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sim.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sim.h
index 29c52879..29c52879 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sim.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sim.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_after_angle.cpp
index 18788919..18788919 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_after_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_after_constr_colon.cpp
index caea467a..caea467a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_after_constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_after_constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_after_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_after_decltype.cpp
index 18448555..18448555 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_after_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_after_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_after_type.cpp
index 6f235d22..6f235d22 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_angle_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_angle_paren.cpp
index 911aa53b..911aa53b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_angle_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_angle_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_arith_additive.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_arith_additive.cpp
index ab2096c8..ab2096c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_arith_additive.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_arith_additive.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_balance_nested_parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_balance_nested_parens.cpp
index dc5f5e8e..dc5f5e8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_balance_nested_parens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_balance_nested_parens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_before_byref_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_before_byref_func.cpp
index 7dd9c14a..7dd9c14a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_before_byref_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_before_byref_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_before_case_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_before_case_colon.cpp
index 0c534fe0..0c534fe0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_before_case_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_before_case_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_before_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_before_constr_colon.cpp
index 796522c7..796522c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_before_constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_before_constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_before_not_var_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_before_not_var_ptr_star.cpp
new file mode 100644
index 00000000..72187d7c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_before_not_var_ptr_star.cpp
@@ -0,0 +1,109 @@
+#include <stdio.h>
+
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char * const*foo3 = (char* const*)"foo";
+char   * const  *foo4 = (char* const  *)"foo";
+char   * const  *foo5 = (char* const  *)"foo";
+char*const*foo6 = (char*const*)"foo";
+
+char* const*foo7(char* const*);
+char* const  *foo8(char* const  *);
+
+int*const *bar0(int);
+char*const*bar1(char* const*);
+char*const  *bar2(char* const  *);
+char  *const  *bar3(char* const  *);
+char *const  *bar4(char* const  *);
+
+void *operator new(int size);
+void*operator new(int size);
+void*    operator new(int size);
+void     *operator new(int size);
+void* operator new(int size);
+
+void *::alloc1(int size);
+void*::alloc2(int size);
+void* ::alloc3(int size);
+void * ::alloc4(int size);
+void     * ::alloc5(int size);
+void     *     ::alloc6(int size);
+
+
+class Test {
+    void* method1();
+    void *method2();
+    void  *method3();
+    void*  method4();
+    void  *  method5();
+};
+
+void* Test::method1() { return nullptr; }
+void *Test::method2() { return NULL; }
+void  *Test::method3() { return NULL; }
+void*  Test::method4() { return nullptr; }
+void  *  Test::method5() { return 0; }
+
+
+namespace testing {
+
+int *func1();
+int*func2();
+int *func3();
+int*func4();
+int*func5();
+
+namespace test {
+int *foo();
+}
+
+}
+
+int *testing::func1() { return nullptr; }
+int* testing::func2() { return NULL; }
+int   *testing::func3() { return nullptr; }
+int * testing::func4() { return NULL; }
+int  *  testing::func5() { return NULL; }
+
+int*testing::test::foo()
+{
+    return NULL;
+}
+
+namespace Bar {
+
+class Foo {
+    int*operator[] (int x) { }
+
+    Foo *get();
+}
+
+}
+
+Bar::Foo*Bar::Foo::get() { }
+
+void* not_malloc(const int);
+
+void*::not_malloc(const int n)
+{
+}
+
+int main()
+{
+    void (* name)();
+
+    int *const *x;
+    int *const*x;
+    (int* )x;
+    (const int *const)x;
+    (int const*)x;
+    (int const *)x;
+    int y = 2+*x;
+    return 0;
+}
+
+auto baz1() -> char* const*;
+auto baz2() -> char* const  *;
+auto baz3() -> char * const  *;
+auto baz4() -> char*const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp
index 45ffb335..45ffb335 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_brace_brace.cpp
index bb730d61..bb730d61 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_brace_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_brace_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_brace_catch.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_brace_catch.cpp
index 7b4bdc5e..7b4bdc5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_brace_catch.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_brace_catch.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_cmt_cpp_region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_cmt_cpp_region.cpp
index b70ef6b1..b70ef6b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_cmt_cpp_region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_cmt_cpp_region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_cmt_cpp_start.cc b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_cmt_cpp_start.cc
index 6a9b203b..6a9b203b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_cmt_cpp_start.cc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_cmt_cpp_start.cc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_cond_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_cond_question.cpp
index cec6c827..cec6c827 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_cond_question.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_cond_question.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_cparen_oparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_cparen_oparen.cpp
index 83c60dd4..83c60dd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_cparen_oparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_cparen_oparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp
index e25d0496..e25d0496 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_decltype.cpp
index 3e2f7e47..3e2f7e47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_endif_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_endif_cmt.cpp
index 9e5b2db8..9e5b2db8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_endif_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_endif_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_enum_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_enum_assign.cpp
index 2ebab438..2ebab438 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_enum_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_enum_assign.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_enum_colon.cpp
index a23c6afd..a23c6afd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_enum_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_enum_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_func_call_paren.cpp
index 90798ef9..90798ef9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_func_call_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_func_call_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_inside_braces_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_inside_braces_enum.cpp
index 8386e215..8386e215 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_inside_braces_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_inside_braces_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_not_not.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_not_not.cpp
index 4ef7f777..4ef7f777 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_not_not.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_not_not.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_paren_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_paren_brace.cpp
index 4ac73f87..4ac73f87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_paren_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_paren_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_qualifier_ptr_star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_qualifier_ptr_star.cpp
new file mode 100644
index 00000000..5330b43a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_qualifier_ptr_star.cpp
@@ -0,0 +1,8 @@
+char* const*foo1 = (char* const*)"foo";
+char* const  *foo2 = (char* const  *)"foo";
+
+char* const*foo3(char* const*);
+char* const  *foo4(char* const  *);
+
+auto foo5() -> char* const*;
+auto foo6() -> char* const  *;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp
index fff4aff4..fff4aff4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_throw_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_throw_paren.cpp
index f45f1a9a..f45f1a9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_throw_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_throw_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_type_func.cpp
index 30e058e7..30e058e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/sp_type_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/sp_type_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/squeeze_ifdef.cpp
index 42699d1d..42699d1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/squeeze_ifdef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/squeeze_ifdef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/static.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/static.h
index 8121fef1..8121fef1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/static.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/static.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/stdcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/stdcall.cpp
index a2353599..a2353599 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/stdcall.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/stdcall.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/string_replace_tab_chars.cpp
index 3534461b..3534461b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/string_replace_tab_chars.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/string_replace_tab_chars.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/strings.cpp
index 1cfea449..1cfea449 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/strings.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/strings.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/tab-0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/tab-0.cpp
index 474aba08..474aba08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/tab-0.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/tab-0.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/tab-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/tab-1.cpp
index dc7a65c4..dc7a65c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/tab-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/tab-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/templ_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/templ_class.h
index 0f102244..0f102244 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/templ_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/templ_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/templates.cpp
index 737599bf..737599bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/templates2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/templates2.cpp
index 46d41560..46d41560 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/templates2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/templates2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/templates3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/templates3.cpp
index 55b11d26..55b11d26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/templates3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/templates3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/templates4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/templates4.cpp
index 10b96e4a..10b96e4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/templates4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/templates4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/throws.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/throws.cpp
index 0419fc77..0419fc77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/throws.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/throws.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/toggle_processing_cmt.cpp
index 6f49594d..6f49594d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/toggle_processing_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/toggle_processing_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/toggle_processing_cmt2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/toggle_processing_cmt2.cpp
index 6b4a0a39..6b4a0a39 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/toggle_processing_cmt2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/toggle_processing_cmt2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/trailing_return.cpp
index b5903ce9..b5903ce9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/trailing_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/trailing_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/trailing_return_byref_ptr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/trailing_return_byref_ptr.cpp
index 14cffd63..14cffd63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/trailing_return_byref_ptr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/trailing_return_byref_ptr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/try-catch-nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/try-catch-nl.cpp
index 447f3cbd..447f3cbd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/try-catch-nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/try-catch-nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/type_brace_init_lst.cpp
index 53e74de2..53e74de2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/uniform_initialization.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/uniform_initialization.cpp
index 37a131e0..37a131e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/uniform_initialization.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/uniform_initialization.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/using-alias-in-define.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/using-alias-in-define.cpp
index 82854287..82854287 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/using-alias-in-define.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/using-alias-in-define.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/var_def_blks.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/var_def_blks.cpp
index aa76a9e8..aa76a9e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/var_def_blks.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/var_def_blks.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/var_def_gap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/var_def_gap.cpp
index 0cca962b..0cca962b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/var_def_gap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/var_def_gap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/variadic-template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/variadic-template.h
index f522097c..f522097c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/variadic-template.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/variadic-template.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/wacky-template.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/wacky-template.cpp
index 99e01b6e..99e01b6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cpp/wacky-template.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cpp/wacky-template.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/1822.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/1822.cs
index a4269bd9..a4269bd9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/1822.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/1822.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/615_nested-usings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/615_nested-usings.cs
index 14a31507..14a31507 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/615_nested-usings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/615_nested-usings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/620_getset-brace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/620_getset-brace.cs
index f6ee6342..f6ee6342 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/620_getset-brace.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/620_getset-brace.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/621_this-spacing.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/621_this-spacing.cs
index bd28a5e8..bd28a5e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/621_this-spacing.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/621_this-spacing.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/625_where-constraints.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/625_where-constraints.cs
index 09274ab9..09274ab9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/625_where-constraints.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/625_where-constraints.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/630_bad-new-init-semicolon-removal.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/630_bad-new-init-semicolon-removal.cs
index 2e6d5a98..2e6d5a98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/630_bad-new-init-semicolon-removal.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/630_bad-new-init-semicolon-removal.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/Issue_2705.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/Issue_2705.cs
index 9a1b3172..9a1b3172 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/Issue_2705.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/Issue_2705.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-11662.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-11662.cs
index 9a49fdba..9a49fdba 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-11662.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-11662.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-11993.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-11993.cs
index 6bc6529a..6bc6529a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-11993.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-11993.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-12303.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-12303.cs
index 01be8291..01be8291 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-12303.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-12303.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1288.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-1288.cs
index 70554a02..70554a02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1288.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-1288.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1338.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-1338.cs
index d10b4893..d10b4893 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1338.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-1338.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1343.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-1343.cs
index 852fe640..852fe640 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1343.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-1343.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1345.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-1345.cs
index e218e6a2..e218e6a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1345.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-1345.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-13955.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-13955.cs
index 940aa89b..940aa89b 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-13955.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-13955.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-14131.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-14131.cs
index c8c3c918..c8c3c918 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-14131.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-14131.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-17253.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-17253.cs
index 7342d82c..7342d82c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-17253.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-17253.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-18437.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-18437.cs
index aab6c498..aab6c498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-18437.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-18437.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-18777.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-18777.cs
index 198d5be3..198d5be3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-18777.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-18777.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-18780.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-18780.cs
index 0eea713e..0eea713e 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-18780.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-18780.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-18829.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-18829.cs
index 62c9f8fb..62c9f8fb 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-18829.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-18829.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1919.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-1919.cs
index 956fd0f8..956fd0f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1919.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-1919.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-19644.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-19644.cs
index da76bfbc..da76bfbc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-19644.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-19644.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1975.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-1975.cs
index af678a93..af678a93 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1975.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-1975.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1977.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-1977.cs
index e4b1b375..e4b1b375 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1977.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-1977.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1978.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-1978.cs
index 14cbdc7d..14cbdc7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-1978.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-1978.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-19895.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-19895.cs
index a22c6fa8..a22c6fa8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-19895.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-19895.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2007.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-2007.cs
index 2e9f163a..2e9f163a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2007.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-2007.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2008.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-2008.cs
index eeb649dd..eeb649dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2008.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-2008.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2020.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-2020.cs
index 37d9ef23..37d9ef23 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2020.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-2020.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2021.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-2021.cs
index 2b08fafe..2b08fafe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2021.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-2021.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-21730.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-21730.cs
index 6fcb8c16..6fcb8c16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-21730.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-21730.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2505.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-2505.cs
index a17e6a5e..a17e6a5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2505.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-2505.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2506.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-2506.cs
index 7bdbb81a..7bdbb81a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2506.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-2506.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2684.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-2684.cs
index 0c91b081..0c91b081 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2684.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-2684.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-2685.cs
index 4c11f20b..4c11f20b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-2685.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-2685.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-29933.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-29933.cs
index ed96bc87..ed96bc87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-29933.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-29933.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-30498_2.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-30498_2.cs
index ba0d8515..ba0d8515 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-30498_2.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-30498_2.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-3083.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-3083.cs
index 5209dc72..5209dc72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-3083.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-3083.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-32658.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-32658.cs
index 145da65f..145da65f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-32658.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-32658.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-3484.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-3484.cs
index 1235aa91..1235aa91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-3484.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-3484.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-36862.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-36862.cs
index cb3cb448..cb3cb448 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-36862.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-36862.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-37241.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-37241.cs
index b2097c4f..b2097c4f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-37241.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-37241.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-40685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-40685.cs
index a2f37547..a2f37547 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-40685.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-40685.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-58354.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-58354.cs
index 6c77de40..6c77de40 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-58354.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-58354.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-9917.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-9917.cs
index 5bd9dc64..5bd9dc64 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/UNI-9917.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/UNI-9917.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/add-nl-before-namespace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/add-nl-before-namespace.cs
index 93a2cf04..93a2cf04 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/add-nl-before-namespace.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/add-nl-before-namespace.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_1591.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/bug_1591.cs
index ac62df9e..ac62df9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_1591.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/bug_1591.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_1620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/bug_1620.cs
index 0c9d4eb9..0c9d4eb9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_1620.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/bug_1620.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_1637.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/bug_1637.cs
index 1f46d1bc..1f46d1bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_1637.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/bug_1637.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_1650.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/bug_1650.cs
index 5c52aece..5c52aece 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_1650.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/bug_1650.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_600.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/bug_600.cs
index 3d93d861..3d93d861 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_600.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/bug_600.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/bug_620.cs
index f6ee6342..f6ee6342 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_620.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/bug_620.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_i_679.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/bug_i_679.cs
index 199ad7e6..199ad7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_i_679.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/bug_i_679.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_i_935.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/bug_i_935.cs
index d2c8ec95..d2c8ec95 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/bug_i_935.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/bug_i_935.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/cast.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/cast.cs
index 77761b89..77761b89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/cast.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/cast.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/cmt_backslash_eol.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/cmt_backslash_eol.cs
index e56aec25..e56aec25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/cmt_backslash_eol.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/cmt_backslash_eol.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/comma.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/comma.cs
index 794410f0..794410f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/comma.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/comma.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/delegate.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/delegate.cs
index 3a4b103c..3a4b103c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/delegate.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/delegate.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/exception-filters.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/exception-filters.cs
index 1e3abca3..1e3abca3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/exception-filters.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/exception-filters.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/fncall_as_ctor_in_attr.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/fncall_as_ctor_in_attr.cs
index cf52b46f..cf52b46f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/fncall_as_ctor_in_attr.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/fncall_as_ctor_in_attr.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/generics.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/generics.cs
index 7bbe04c7..7bbe04c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/generics.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/generics.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/getset.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/getset.cs
index 59aaa5bc..59aaa5bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/getset.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/getset.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/gs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/gs.cs
index 16adc604..16adc604 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/gs.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/gs.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/ifcolalign.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/ifcolalign.cs
index d2e40c78..d2e40c78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/ifcolalign.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/ifcolalign.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/ifcomment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/ifcomment.cs
index 6663a6ca..6663a6ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/ifcomment.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/ifcomment.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/indent-multistring-coulmn1.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/indent-multistring-coulmn1.cs
index 56bdf473..56bdf473 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/indent-multistring-coulmn1.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/indent-multistring-coulmn1.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/logger.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/logger.cs
index defede8a..defede8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/logger.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/logger.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/mdarray_space.cs
index e5338c11..e5338c11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/mdarray_space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/mdarray_space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/misc-failures.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/misc-failures.cs
index 857c06f9..857c06f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/misc-failures.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/misc-failures.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/mod_full_brace_nl_block_rem_mlcond.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/mod_full_brace_nl_block_rem_mlcond.cs
index f8db4f0b..f8db4f0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/mod_full_brace_nl_block_rem_mlcond.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/mod_full_brace_nl_block_rem_mlcond.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/mod_full_paren_if_bool.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/mod_full_paren_if_bool.cs
index 6bcd9201..6bcd9201 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/mod_full_paren_if_bool.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/mod_full_paren_if_bool.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/new-constraint-paren-space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/new-constraint-paren-space.cs
index 209f2721..209f2721 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/new-constraint-paren-space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/new-constraint-paren-space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/nullable_prop.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/nullable_prop.cs
index 21c4f7b0..21c4f7b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/nullable_prop.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/nullable_prop.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/oneline_property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/oneline_property.cs
index 1d7a2c26..1d7a2c26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/oneline_property.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/oneline_property.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/operator-null-conditional.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/operator-null-conditional.cs
index 530bdd27..530bdd27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/operator-null-conditional.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/operator-null-conditional.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/operator_null-coalescing-assignment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/operator_null-coalescing-assignment.cs
index 416e6afc..416e6afc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/operator_null-coalescing-assignment.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/operator_null-coalescing-assignment.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/preserveTabs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/preserveTabs.cs
index c9583dcd..c9583dcd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/preserveTabs.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/preserveTabs.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/property.cs
index 85e08bae..85e08bae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/property.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/property.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/region.cs
index 4f8667f2..4f8667f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/remove_semi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/remove_semi.cs
index 2e6d5a98..2e6d5a98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/remove_semi.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/remove_semi.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/sf607.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/sf607.cs
index f0617c19..f0617c19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/sf607.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/sf607.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/sf628.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/sf628.cs
index 803c9962..803c9962 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/sf628.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/sf628.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/simple.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/simple.cs
index 30acd134..30acd134 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/simple.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/simple.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/sort_using.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/sort_using.cs
index 881b4d5b..881b4d5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/sort_using.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/sort_using.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/sort_using_categ.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/sort_using_categ.cs
index 173e42bb..173e42bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/sort_using_categ.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/sort_using_categ.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/sp_between_new_paren.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/sp_between_new_paren.cs
index f5d8381d..f5d8381d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/sp_between_new_paren.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/sp_between_new_paren.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/squeeze-paren-close-Option.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/squeeze-paren-close-Option.cs
index 37203f4a..37203f4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/squeeze-paren-close-Option.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/squeeze-paren-close-Option.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/string_multi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/string_multi.cs
index 9e715e51..9e715e51 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/string_multi.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/string_multi.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/strings.cs
index 6794e762..6794e762 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/strings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/strings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/tcf.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/tcf.cs
index f3ac3664..f3ac3664 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/tcf.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/tcf.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/unsafe.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/unsafe.cs
index 5dc90cb4..5dc90cb4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/unsafe.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/unsafe.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/utf16be.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/utf16be.cs
index 13da3090..13da3090 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/utf16be.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/utf16be.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/utf16be_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/utf16be_no_bom.cs
index 33587b97..33587b97 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/utf16be_no_bom.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/utf16be_no_bom.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/utf16le.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/utf16le.cs
index 3f16b9d0..3f16b9d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/utf16le.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/utf16le.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/utf16le_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/utf16le_no_bom.cs
index 4a7f9ccc..4a7f9ccc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/utf16le_no_bom.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/utf16le_no_bom.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/var-member.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/var-member.cs
index 0f7ffb23..0f7ffb23 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/var-member.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/var-member.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/verbatim_strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/verbatim_strings.cs
index 47c3ed4c..47c3ed4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/verbatim_strings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/verbatim_strings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/when.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/when.cs
index 2785b894..2785b894 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/cs/when.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/cs/when.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/1438.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/1438.d
index 10a43753..10a43753 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/1438.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/1438.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/HashMap.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/HashMap.d
index 618b3e59..618b3e59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/HashMap.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/HashMap.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/Lexer.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/Lexer.d
index 004d9d8a..004d9d8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/Lexer.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/Lexer.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/bug-indent.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/bug-indent.d
index 321ab6f1..321ab6f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/bug-indent.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/bug-indent.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/casts.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/casts.d
index 42d54916..42d54916 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/casts.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/casts.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/const.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/const.d
index 778957fd..778957fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/const.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/const.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/d_sp_paren.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/d_sp_paren.d
index 2b28a7f1..2b28a7f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/d_sp_paren.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/d_sp_paren.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/delegate.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/delegate.d
index 0115ae00..0115ae00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/delegate.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/delegate.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/enum.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/enum.d
index 804ef27c..804ef27c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/enum.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/enum.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/extern_.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/extern_.d
index a583b08e..a583b08e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/extern_.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/extern_.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/funcfunc.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/funcfunc.d
index ee717abc..ee717abc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/funcfunc.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/funcfunc.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/imports.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/imports.d
index 758fefb7..758fefb7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/imports.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/imports.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/invariant.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/invariant.d
index 46a8efdc..46a8efdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/invariant.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/invariant.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/numbers.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/numbers.d
index e51bf8ac..e51bf8ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/numbers.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/numbers.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/sort_import.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/sort_import.d
index d929f8e8..d929f8e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/sort_import.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/sort_import.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/square_indent_tab.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/square_indent_tab.d
index 1dee3a17..1dee3a17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/square_indent_tab.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/square_indent_tab.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/static_if.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/static_if.d
index 24e6eaba..24e6eaba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/static_if.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/static_if.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/static_if_in_struct.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/static_if_in_struct.d
index be936335..be936335 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/static_if_in_struct.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/static_if_in_struct.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/strings.d
index a62adec3..a62adec3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/strings.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/strings.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/template.d
index fe5a162c..fe5a162c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/template.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/template.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/template_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/template_spacing000.d
index 627ca266..627ca266 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/template_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/template_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/template_spacing001.d
index 745e5b36..745e5b36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/template_spacing001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/template_spacing001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/template_use.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/template_use.d
index 94cdbf6b..94cdbf6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/template_use.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/template_use.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/tst01.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/tst01.d
index 3a3728f2..3a3728f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/tst01.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/tst01.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/tst02.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/tst02.d
index 0b428d60..0b428d60 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/tst02.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/tst02.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/tst03.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/tst03.d
index 611f12f9..611f12f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/tst03.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/tst03.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/type_spacing000.d
index e11e545b..e11e545b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/type_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/type_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/vbraces000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/vbraces000.d
index d2f1b642..d2f1b642 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/vbraces000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/vbraces000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/vbraces001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/vbraces001.d
index a59ab020..a59ab020 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/vbraces001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/vbraces001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/vbraces002.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/vbraces002.d
index 5e45e999..5e45e999 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/vbraces002.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/vbraces002.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/volatile-1.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/volatile-1.d
index c9f41d3f..c9f41d3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/volatile-1.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/volatile-1.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/volatile-2.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/volatile-2.d
index bc5a0de4..bc5a0de4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/volatile-2.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/volatile-2.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/volatile-3.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/volatile-3.d
index 039f788a..039f788a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/volatile-3.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/volatile-3.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/volatile.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/volatile.d
index c42d1893..c42d1893 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/volatile.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/volatile.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/wysiwyg_strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/wysiwyg_strings.d
index cfdec32a..cfdec32a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/d/wysiwyg_strings.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/d/wysiwyg_strings.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/ecma/example-1.es b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/ecma/example-1.es
index 0bc9b775..0bc9b775 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/ecma/example-1.es
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/ecma/example-1.es
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/Issue_1122.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/Issue_1122.java
index 5712f9ee..5712f9ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/Issue_1122.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/Issue_1122.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/Issue_1124.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/Issue_1124.java
index dcea4172..dcea4172 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/Issue_1124.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/Issue_1124.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/Issue_1845.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/Issue_1845.java
index cc7656ba..cc7656ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/Issue_1845.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/Issue_1845.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/Issue_670.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/Issue_670.java
index 52d64f1e..52d64f1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/Issue_670.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/Issue_670.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/Java8DoubleColon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/Java8DoubleColon.java
index ec594909..ec594909 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/Java8DoubleColon.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/Java8DoubleColon.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/annotation1.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/annotation1.java
index d7417542..d7417542 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/annotation1.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/annotation1.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/annotation2.java
index 596c2562..596c2562 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/annotation2.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/annotation2.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/annotation3.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/annotation3.java
index 3d84c04c..3d84c04c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/annotation3.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/annotation3.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/assert.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/assert.java
index 8076663b..8076663b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/assert.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/assert.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/cast.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/cast.java
index 8f2d983b..8f2d983b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/cast.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/cast.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/double_brace.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/double_brace.java
index 8ba15c47..8ba15c47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/double_brace.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/double_brace.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/doxy-javadoc-alignment.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/doxy-javadoc-alignment.java
index 838d765c..838d765c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/doxy-javadoc-alignment.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/doxy-javadoc-alignment.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/foreach.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/foreach.java
index e475dc29..e475dc29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/foreach.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/foreach.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/generics.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/generics.java
index 729013ce..729013ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/generics.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/generics.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/generics_return_type.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/generics_return_type.java
index 818ac721..818ac721 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/generics_return_type.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/generics_return_type.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/generics_wildcard.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/generics_wildcard.java
index 358e333b..358e333b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/generics_wildcard.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/generics_wildcard.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/i1121.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/i1121.java
index 18567ec3..18567ec3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/i1121.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/i1121.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/issue_672.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/issue_672.java
index 2f632625..2f632625 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/issue_672.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/issue_672.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/leading-tabs-for-java-lambda.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/leading-tabs-for-java-lambda.java
index 19b6df0f..19b6df0f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/leading-tabs-for-java-lambda.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/leading-tabs-for-java-lambda.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/long_cl_cmt.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/long_cl_cmt.java
index 45e5252b..45e5252b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/long_cl_cmt.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/long_cl_cmt.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/nl_before_ignore_after_case.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/nl_before_ignore_after_case.java
index a84e8847..a84e8847 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/nl_before_ignore_after_case.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/nl_before_ignore_after_case.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/sf567.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/sf567.java
index 68a63221..68a63221 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/sf567.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/sf567.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/sp_after_angle.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/sp_after_angle.java
index 1e11c4c9..1e11c4c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/sp_after_angle.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/sp_after_angle.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/sp_after_for_colon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/sp_after_for_colon.java
index fecd1833..fecd1833 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/sp_after_for_colon.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/sp_after_for_colon.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/sp_before_byref.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/sp_before_byref.java
index 7927ee89..7927ee89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/sp_before_byref.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/sp_before_byref.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/sp_this_paren.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/sp_this_paren.java
index 628b327f..628b327f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/sp_this_paren.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/sp_this_paren.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/synchronized.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/synchronized.java
index 369394b8..369394b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/synchronized.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/synchronized.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/try.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/try.java
index aea6a7f3..aea6a7f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/try.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/try.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/variable_aligns.java b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/variable_aligns.java
index 76c6131c..76c6131c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/java/variable_aligns.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/java/variable_aligns.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/1927.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/1927.m
index 9f8d7a7b..9f8d7a7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/1927.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/1927.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3766.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/3766.m
index b9c06cee..b9c06cee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3766.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/3766.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3767.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/3767.mm
index 2ff485f2..2ff485f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3767.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/3767.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3811.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/3811.mm
index 4510b8c2..4510b8c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3811.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/3811.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3812.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/3812.m
index acea28c0..acea28c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3812.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/3812.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3813.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/3813.m
index 37e9239f..37e9239f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3813.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/3813.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3819.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/3819.m
index 2a34b1c3..2a34b1c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3819.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/3819.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3822.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/3822.h
index e0f113e1..e0f113e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3822.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/3822.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3823.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/3823.m
index 9c110935..9c110935 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/3823.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/3823.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Declarations.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/Declarations.h
index e1ad3c6b..e1ad3c6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Declarations.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/Declarations.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Fraction.h b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/Fraction.h
index 364b1de8..364b1de8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Fraction.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/Fraction.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Fraction.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/Fraction.m
index 20994f34..20994f34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Fraction.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/Fraction.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Issue_2172.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/Issue_2172.m
index 02584e91..02584e91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Issue_2172.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/Issue_2172.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Issue_2289.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/Issue_2289.m
index c046cb1e..c046cb1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Issue_2289.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/Issue_2289.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Issue_681.oc b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/Issue_681.oc
index fb4c6685..fb4c6685 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/Issue_681.oc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/Issue_681.oc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/UNI-11095.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/UNI-11095.mm
index 34ed4050..34ed4050 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/UNI-11095.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/UNI-11095.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/UNI-1333.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/UNI-1333.mm
index 5c91693c..5c91693c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/UNI-1333.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/UNI-1333.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/align-objc-like-xcode.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/align-objc-like-xcode.m
index 6852ac12..6852ac12 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/align-objc-like-xcode.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/align-objc-like-xcode.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/align_colon_with_ternary_1.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/align_colon_with_ternary_1.m
index ddee5abb..ddee5abb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/align_colon_with_ternary_1.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/align_colon_with_ternary_1.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/align_colon_with_ternary_2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/align_colon_with_ternary_2.m
index b5e5669a..b5e5669a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/align_colon_with_ternary_2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/align_colon_with_ternary_2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/argtypes.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/argtypes.mm
index fd2ff142..fd2ff142 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/argtypes.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/argtypes.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/asm.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/asm.h.mm
index 97c0edd3..97c0edd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/asm.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/asm.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/attribute_specifier_seqs.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/attribute_specifier_seqs.mm
index c9b6f24d..c9b6f24d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/attribute_specifier_seqs.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/attribute_specifier_seqs.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/available.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/available.m
index 8216d17f..8216d17f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/available.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/available.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/block_in_method.m
index e0dfcd76..e0dfcd76 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/block_in_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/block_in_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/block_literal_protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/block_literal_protocol.m
index 02d1cfca..02d1cfca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/block_literal_protocol.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/block_literal_protocol.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/block_pointer.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/block_pointer.m
index 9c7ac70b..9c7ac70b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/block_pointer.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/block_pointer.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/blocks.m
index 617e0b78..617e0b78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/blocks_align.m
index 2ddf75c6..2ddf75c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/blocks_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/blocks_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/blocks_align2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/blocks_align2.m
index f4e875c9..f4e875c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/blocks_align2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/blocks_align2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/box.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/box.m
index 98a3516a..98a3516a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/box.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/box.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/boxed_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/boxed_receiver.m
index 3460b920..3460b920 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/boxed_receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/boxed_receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_1366.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_1366.m
index 5e81ed4a..5e81ed4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_1366.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_1366.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_167.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_167.m
index e404e2aa..e404e2aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_167.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_167.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_1674.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_1674.m
index 82c20161..82c20161 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_1674.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_1674.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_1683.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_1683.m
index 3ee562c0..3ee562c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_1683.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_1683.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_340.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_340.m
index ea9f8201..ea9f8201 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_340.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_340.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_404.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_404.m
index 3ecb87f0..3ecb87f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_404.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_404.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_497.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_497.m
index a976d43d..a976d43d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_497.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_497.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_841.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_841.m
index dea826d2..dea826d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_841.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_841.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_i_125-412.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_i_125-412.m
index c92d2e66..c92d2e66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_i_125-412.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_i_125-412.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_i_408.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_i_408.m
index c8a3a450..c8a3a450 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_i_408.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_i_408.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_i_477.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_i_477.m
index a1a81749..a1a81749 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/bug_i_477.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/bug_i_477.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/c-cpp-oc-wrapper.c b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/c-cpp-oc-wrapper.c
index 663a4cc8..663a4cc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/c-cpp-oc-wrapper.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/c-cpp-oc-wrapper.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/cast.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/cast.m
index daa9cb6d..daa9cb6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/cast.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/cast.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/casting.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/casting.mm
index c8022c7b..c8022c7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/casting.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/casting.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/chunk_ends_type1.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/chunk_ends_type1.m
index fb9bb4e1..fb9bb4e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/chunk_ends_type1.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/chunk_ends_type1.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/chunk_ends_type2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/chunk_ends_type2.m
index 27e31cdc..27e31cdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/chunk_ends_type2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/chunk_ends_type2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/chunk_ends_type3.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/chunk_ends_type3.m
index 8d8676c8..8d8676c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/chunk_ends_type3.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/chunk_ends_type3.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/chunk_ends_type4.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/chunk_ends_type4.m
index dd4d55fe..dd4d55fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/chunk_ends_type4.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/chunk_ends_type4.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/cmt_insert.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/cmt_insert.m
index 58a4c894..58a4c894 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/cmt_insert.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/cmt_insert.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/cmt_insert2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/cmt_insert2.m
index 4a31e975..4a31e975 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/cmt_insert2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/cmt_insert2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/code_placeholder.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/code_placeholder.m
index 6245bfa4..6245bfa4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/code_placeholder.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/code_placeholder.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/complex_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/complex_method.m
index b22c34b6..b22c34b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/complex_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/complex_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/definesalign.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/definesalign.h.mm
index a249d1aa..a249d1aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/definesalign.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/definesalign.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/delete-space-oc.mm
index 66e24dc8..66e24dc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/delete-space-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/delete-space-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/double-indent-objc-dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/double-indent-objc-dict.m
index f94e5105..f94e5105 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/double-indent-objc-dict.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/double-indent-objc-dict.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/double_angle_space.m
index f7164498..f7164498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/double_angle_space.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/double_angle_space.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/exceptions.m
index c8d6f6f2..c8d6f6f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/exceptions.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/exceptions.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/extern-c-attribute.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/extern-c-attribute.m
index fb84ce73..fb84ce73 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/extern-c-attribute.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/extern-c-attribute.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/for.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/for.m
index fc159fc6..fc159fc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/for.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/for.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/for2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/for2.m
index 535bc50b..535bc50b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/for2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/for2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/func-param-wrap-oc.mm
index 16f98ce9..16f98ce9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/func-param-wrap-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/func-param-wrap-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/func_def.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/func_def.mm
index b3655728..b3655728 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/func_def.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/func_def.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/gh137.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/gh137.m
index 779e0f2f..779e0f2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/gh137.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/gh137.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/gh293.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/gh293.m
index bb4cb52c..bb4cb52c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/gh293.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/gh293.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/gh511.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/gh511.m
index cee32794..cee32794 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/gh511.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/gh511.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/i1213.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/i1213.m
index f47e5964..f47e5964 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/i1213.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/i1213.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/indent-inside-ternary-operator.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/indent-inside-ternary-operator.m
index ff979acf..ff979acf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/indent-inside-ternary-operator.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/indent-inside-ternary-operator.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/indent-objc-block.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/indent-objc-block.m
index b882abf5..b882abf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/indent-objc-block.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/indent-objc-block.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/indent_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/indent_boxed.m
index c7df968f..c7df968f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/indent_boxed.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/indent_boxed.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/indent_oc_inside_msg_sel.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/indent_oc_inside_msg_sel.m
index f20cd048..f20cd048 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/indent_oc_inside_msg_sel.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/indent_oc_inside_msg_sel.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/indent_single_newline.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/indent_single_newline.m
index 27e79e8a..27e79e8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/indent_single_newline.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/indent_single_newline.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/inttypes.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/inttypes.h.mm
index 6e093789..6e093789 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/inttypes.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/inttypes.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2629.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/issue_2629.m
index e690ea58..e690ea58 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2629.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/issue_2629.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2631.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/issue_2631.m
index 7989b020..7989b020 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2631.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/issue_2631.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2675.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/issue_2675.m
index 1d4cafe2..1d4cafe2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2675.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/issue_2675.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2722.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/issue_2722.m
index 65dcb131..65dcb131 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2722.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/issue_2722.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2724.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/issue_2724.m
index 51c90671..51c90671 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2724.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/issue_2724.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2727.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/issue_2727.m
index f15542f1..f15542f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_2727.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/issue_2727.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_3031.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/issue_3031.mm
index 028d55d9..028d55d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/issue_3031.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/issue_3031.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/kw.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/kw.m
index a4d25624..a4d25624 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/kw.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/kw.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/literals.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/literals.mm
index 98522f3d..98522f3d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/literals.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/literals.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/macro-close-brace.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/macro-close-brace.m
index 0eb3fa81..0eb3fa81 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/macro-close-brace.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/macro-close-brace.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/main.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/main.m
index f2fdf16a..f2fdf16a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/main.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/main.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/method_ends_semicolon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/method_ends_semicolon.m
index e3c5637e..e3c5637e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/method_ends_semicolon.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/method_ends_semicolon.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/misc.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/misc.m
index 5038a14c..5038a14c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/misc.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/misc.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/more_blocks.m
index 8695ffdc..8695ffdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/more_blocks_2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/more_blocks_2.m
index 55636ae5..55636ae5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/more_blocks_2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/more_blocks_2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/msg.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/msg.m
index cca460f9..cca460f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/msg.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/msg.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/msg_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/msg_align.m
index 3b61a051..3b61a051 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/msg_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/msg_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/negative_value.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/negative_value.m
index 9aa4dc80..9aa4dc80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/negative_value.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/negative_value.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/nelem.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/nelem.m
index d42ce3b6..d42ce3b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/nelem.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/nelem.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/newlines.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/newlines.mm
index 31a46376..31a46376 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/newlines.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/newlines.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/nl_func_call_args_multi_line_ignore_closures.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/nl_func_call_args_multi_line_ignore_closures.m
index ea132bab..ea132bab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/nl_func_call_args_multi_line_ignore_closures.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/nl_func_call_args_multi_line_ignore_closures.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/nl_oc_msg_args_max_code_width.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/nl_oc_msg_args_max_code_width.m
index aa093dfd..aa093dfd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/nl_oc_msg_args_max_code_width.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/nl_oc_msg_args_max_code_width.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/nl_oc_msg_args_min_params.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/nl_oc_msg_args_min_params.m
index aa093dfd..aa093dfd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/nl_oc_msg_args_min_params.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/nl_oc_msg_args_min_params.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/ns_enum-i.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/ns_enum-i.m
index e5caad06..e5caad06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/ns_enum-i.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/ns_enum-i.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/ns_enum.m
index cdd729d8..cdd729d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/ns_enum.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/ns_enum.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/objc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/objc.mm
index 7f0e706a..7f0e706a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/objc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/objc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/oc-split.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/oc-split.m
index 3b656bfc..3b656bfc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/oc-split.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/oc-split.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/oc_cond_colon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/oc_cond_colon.m
index 50cf56b5..50cf56b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/oc_cond_colon.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/oc_cond_colon.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/oc_msg_in_pp.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/oc_msg_in_pp.m
index 8496973b..8496973b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/oc_msg_in_pp.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/oc_msg_in_pp.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/ocpp_msg_access.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/ocpp_msg_access.mm
index e5a4091f..e5a4091f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/ocpp_msg_access.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/ocpp_msg_access.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/pp-ignore.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/pp-ignore.mm
index 2673008c..2673008c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/pp-ignore.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/pp-ignore.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/pp_bool.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/pp_bool.m
index b1bf896c..b1bf896c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/pp_bool.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/pp_bool.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/properties.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/properties.m
index 4de60057..4de60057 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/properties.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/properties.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/protocol.m
index 31a8b86f..31a8b86f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/protocol.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/protocol.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/react_native.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/react_native.m
index eadf314f..eadf314f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/react_native.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/react_native.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/real_world_file.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/real_world_file.m
index 26ec3cb2..26ec3cb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/real_world_file.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/real_world_file.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/receiver.m
index 274d4130..274d4130 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/return_type.m
index 62a5c246..62a5c246 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/return_type.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/return_type.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/selector.m
index a5a89475..a5a89475 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/selector.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/selector.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sort_import.m
index 1a227b7e..1a227b7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sort_import_group.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sort_import_group.m
index 9e14f0fc..9e14f0fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sort_import_group.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sort_import_group.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sort_import_group_regex.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sort_import_group_regex.mm
index 38d8aa29..38d8aa29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sort_import_group_regex.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sort_import_group_regex.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_after_angle.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sp_after_angle.m
index 259d2011..259d2011 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_after_angle.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sp_after_angle.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_after_oc_msg_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sp_after_oc_msg_receiver.m
index aad36be5..aad36be5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_after_oc_msg_receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sp_after_oc_msg_receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sp_before_oc_proto_list.m
index c0d96bdb..c0d96bdb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_before_oc_proto_list.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sp_before_oc_proto_list.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_cond_ternary_short.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sp_cond_ternary_short.m
index 6c1ce050..6c1ce050 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_cond_ternary_short.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sp_cond_ternary_short.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_inside_braces_oc_dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sp_inside_braces_oc_dict.m
index 272a2f28..272a2f28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_inside_braces_oc_dict.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sp_inside_braces_oc_dict.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_oc_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sp_oc_boxed.m
index 0c6948c0..0c6948c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_oc_boxed.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sp_oc_boxed.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_oc_catch.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sp_oc_catch.m
index fe04844d..fe04844d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_oc_catch.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sp_oc_catch.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_oc_classname_paren-r.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sp_oc_classname_paren-r.m
index 1076bbb3..1076bbb3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_oc_classname_paren-r.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sp_oc_classname_paren-r.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_oc_synchronized.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sp_oc_synchronized.m
index e4de748b..e4de748b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/sp_oc_synchronized.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/sp_oc_synchronized.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/string.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/string.m
index f3fca80f..f3fca80f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/string.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/string.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/ternary.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/ternary.m
index 3fdddd93..3fdddd93 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/ternary.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/ternary.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/typeof.m b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/typeof.m
index d5183a1d..d5183a1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/oc/typeof.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/oc/typeof.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/Issue_2586.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/Issue_2586.pawn
index 89558691..89558691 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/Issue_2586.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/Issue_2586.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/Issue_2665.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/Issue_2665.pawn
index ddcb045a..ddcb045a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/Issue_2665.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/Issue_2665.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/comment.p b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/comment.p
index 785521ac..785521ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/comment.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/comment.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/crusty_ex-1.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/crusty_ex-1.sma
index 35ee0515..35ee0515 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/crusty_ex-1.sma
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/crusty_ex-1.sma
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/enum.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/enum.pawn
index 588efc35..588efc35 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/enum.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/enum.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/functions.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/functions.pawn
index cdda5e05..cdda5e05 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/functions.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/functions.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/gh419.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/gh419.pawn
index 9db7b08f..9db7b08f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/gh419.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/gh419.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/preproc.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/preproc.pawn
index e15d360e..e15d360e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/preproc.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/preproc.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/rpn_calc.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/rpn_calc.pawn
index 2965d9c7..2965d9c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/rpn_calc.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/rpn_calc.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/str-escape.p b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/str-escape.p
index 5600eae3..5600eae3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/str-escape.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/str-escape.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/switch-vsemi.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/switch-vsemi.sma
index c2efacfb..c2efacfb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/switch-vsemi.sma
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/switch-vsemi.sma
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/tags.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/tags.pawn
index 56bdd2b9..56bdd2b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/tags.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/tags.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/test1.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/test1.pawn
index ecefe6e0..ecefe6e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/test1.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/test1.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/traffic.p b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/traffic.p
index f5cf0f7f..f5cf0f7f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/traffic.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/traffic.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/unbraced.p b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/unbraced.p
index 10c41663..10c41663 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/pawn/unbraced.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/pawn/unbraced.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/sql/issue_527.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/sql/issue_527.sqc
index 5514ff31..5514ff31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/sql/issue_527.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/sql/issue_527.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/sql/mysql.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/sql/mysql.sqc
index 197c2847..197c2847 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/sql/mysql.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/sql/mysql.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/sql/sta-select.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/sql/sta-select.sqc
index 863edf5b..863edf5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/sql/sta-select.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/sql/sta-select.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/Issue_2090.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/Issue_2090.vala
index 22698792..22698792 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/Issue_2090.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/Issue_2090.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/Issue_2270.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/Issue_2270.vala
index 7bb897d8..7bb897d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/Issue_2270.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/Issue_2270.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/advanced.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/advanced.vala
index 2b85c031..2b85c031 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/advanced.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/advanced.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/cast.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/cast.vala
index 77761b89..77761b89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/cast.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/cast.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/gh287.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/gh287.vala
index fcb6fca6..fcb6fca6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/gh287.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/gh287.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/identifier.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/identifier.vala
index 5dee8d3b..5dee8d3b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/identifier.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/identifier.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/list.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/list.vala
index e9b48acc..e9b48acc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/list.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/list.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/mdarray_space.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/mdarray_space.vala
index fa9eef2f..fa9eef2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/mdarray_space.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/mdarray_space.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/nullable.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/nullable.vala
index 3d93d861..3d93d861 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/nullable.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/nullable.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/preproc.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/preproc.vala
index 3ab2ccc8..3ab2ccc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/preproc.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/preproc.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/verbatim_str.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/verbatim_str.vala
index 11f19c01..11f19c01 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/verbatim_str.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/verbatim_str.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/verbatim_str2.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/verbatim_str2.vala
index 9d8798b7..9d8798b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/input/vala/verbatim_str2.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/input/vala/verbatim_str2.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/java.test b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/java.test
index 9085dc14..9085dc14 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/java.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/java.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/objective-c.test b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/objective-c.test
index 84fea584..1bedb4af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/objective-c.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/objective-c.test
@@ -21,10 +21,11 @@
 50014  oc/sp_oc_classname_paren-r.cfg           oc/sp_oc_classname_paren-r.m
 50015  oc/oc10.cfg                              oc/receiver.m
 
-50016  oc/oc11.cfg                              oc/ternary.m
-50017  oc/ternary_short.cfg                     oc/ternary.m
+#        we need any expert to solve
+#50016  oc/oc11.cfg                              oc/ternary.m
+#50017  oc/ternary_short.cfg                     oc/ternary.m
 
-50018  common/indent_inside_ternary_operator.cfg  oc/indent-inside-ternary-operator.m
+#50018  common/indent_inside_ternary_operator.cfg  oc/indent-inside-ternary-operator.m
 
 50020  oc/sp_after_oc_at_sel_add.cfg            oc/selector.m
 50021  oc/sp_after_oc_at_sel_force.cfg          oc/selector.m
@@ -96,7 +97,8 @@
 
 50400  oc/oc16.cfg                              oc/for.m
 
-50410  oc/oc_cond_colon.cfg                     oc/oc_cond_colon.m              OC+
+#        we need any expert to solve
+#50410  oc/oc_cond_colon.cfg                     oc/oc_cond_colon.m              OC+
 50411  common/attribute_specifier_seqs.cfg      oc/attribute_specifier_seqs.mm  OC+
 
 50500  oc/oc17.cfg                              oc/code_placeholder.m
@@ -177,8 +179,9 @@
 50905  oc/double_angle_space_2.cfg              oc/double_angle_space.m
 50906  oc/double_angle_space_3.cfg              oc/double_angle_space.m
 
-50907  oc/align_colon_with_ternary_1.cfg        oc/align_colon_with_ternary_1.m
-50908  oc/align_colon_with_ternary_2.cfg        oc/align_colon_with_ternary_2.m
+#        we need any expert to solve
+#50907  oc/align_colon_with_ternary_1.cfg        oc/align_colon_with_ternary_1.m
+#50908  oc/align_colon_with_ternary_2.cfg        oc/align_colon_with_ternary_2.m
 50909  oc/3766.cfg                              oc/3766.m
 50910  oc/3767.cfg                              oc/3767.mm                          OC+
 50911  oc/3811.cfg                              oc/3811.mm                          OC+
@@ -210,5 +213,6 @@
 10102  oc/U24-Cpp.cfg                           oc/pp-ignore.mm
 11030  oc/U08-Cpp.cfg                           oc/argtypes.mm
 11031  oc/U09-Cpp.cfg                           oc/casting.mm
-11032  oc/U10-Cpp.cfg                           oc/newlines.mm
+#        we need any expert to solve
+#11032  oc/U10-Cpp.cfg                           oc/newlines.mm
 60011  oc/UNI-11095.cfg                         oc/UNI-11095.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/pawn.test b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/pawn.test
index 7946465e..7946465e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/pawn.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/pawn.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/run_format_tests.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/run_format_tests.py
index 671188c2..671188c2 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/run_format_tests.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/run_format_tests.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/run_sources_tests.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/run_sources_tests.py
index ebbc6623..ebbc6623 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/run_sources_tests.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/run_sources_tests.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/run_test.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/run_test.py
index 7b5a9d57..7b5a9d57 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/run_test.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/run_test.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/staging.test b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/staging.test
index e71faddf..e71faddf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/staging.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/staging.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/__init__.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/test_uncrustify/__init__.py
index bf83b667..bf83b667 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/__init__.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/test_uncrustify/__init__.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/ansicolor.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/test_uncrustify/ansicolor.py
index 44d6dbd5..44d6dbd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/ansicolor.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/test_uncrustify/ansicolor.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/config.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/test_uncrustify/config.py
index 4370816d..4370816d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/config.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/test_uncrustify/config.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/failure.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/test_uncrustify/failure.py
index 0972930f..0972930f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/failure.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/test_uncrustify/failure.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/selector.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/test_uncrustify/selector.py
index 93646257..93646257 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/selector.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/test_uncrustify/selector.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/test.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/test_uncrustify/test.py
index f621f40f..f621f40f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/test.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/test_uncrustify/test.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/utilities.py b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/test_uncrustify/utilities.py
index 8570e6d3..8570e6d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/test_uncrustify/utilities.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/test_uncrustify/utilities.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/tests.vpj b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/tests.vpj
index a5ed4fd3..a5ed4fd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/tests.vpj
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/tests.vpj
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/vala.test b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/vala.test
index fa1ead91..fa1ead91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/tests/vala.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/tests/vala.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/uncrustify.vpj b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/uncrustify.vpj
index 7f01a968..7f01a968 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/uncrustify.vpj
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/uncrustify.vpj
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/uncrustify.vpw b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/uncrustify.vpw
index 245d8153..245d8153 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.76.0/uncrustify.vpw
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.78.0/uncrustify.vpw
diff --git a/debian/uncrustify-trinity/uncrustify-trinity_0.76.0.orig.tar.gz b/debian/uncrustify-trinity/uncrustify-trinity_0.76.0.orig.tar.gz
deleted file mode 100644
index 6870c142..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity_0.76.0.orig.tar.gz
+++ /dev/null
diff --git a/debian/uncrustify-trinity/uncrustify-trinity_0.78.0.orig.tar.gz b/debian/uncrustify-trinity/uncrustify-trinity_0.78.0.orig.tar.gz
new file mode 100644
index 00000000..27360583
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity_0.78.0.orig.tar.gz